Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.13 fix#1 #87

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

5.13 fix#1 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cfacd6
adding doi_shoulder
schorcht-ioer Apr 19, 2023
37e6903
fixing url of doi_doi_shoulder
schorcht-ioer Apr 19, 2023
e49a6f5
fixing dataciterestapiurlstring
schorcht-ioer Apr 19, 2023
33bd92e
fixing dataciterestapiurlstring
schorcht-ioer Apr 19, 2023
77e21b9
adding "doi_shoulder" variable
schorcht-ioer Apr 19, 2023
5e0ba25
fixing doi_soulder url
schorcht-ioer Apr 19, 2023
5968bac
.env_sample with example of configuration
schorcht-ioer Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env_sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LOCAL_WAR=./dataverse.war
COMPOSE_FILE=distros/vanilla/docker-compose.yml
#COMPOSE_FILE=distros/vanilla/docker-compose.yml

# Activate Dataverse language pack by setting language code:
# en - English hu - Hungarian fr - French sl - Slovenian
Expand Down Expand Up @@ -53,7 +53,7 @@ WEBHOOK=/opt/payara/triggers/external-services.py
#doi_shoulder=doi_shoulder
#doi_username=doi_username
#doi_password=doi_password
dataciterestapiurlstring=https\\:\/\/api.test.datacite.org
dataciterestapiurlstring=https\:\/\/api.test.datacite.org
baseurlstring=https\:\/\/mds.test.datacite.org

# AWS settings
Expand Down
2 changes: 1 addition & 1 deletion distros/vanilla/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ WEBHOOK=/opt/payara/triggers/external-services.py
#doi_shoulder=doi_shoulder
#doi_username=doi_username
#doi_password=doi_password
dataciterestapiurlstring=https\\:\/\/api.test.datacite.org
dataciterestapiurlstring=https\:\/\/api.test.datacite.org
baseurlstring=https\:\/\/mds.test.datacite.org

# AWS settings
Expand Down
2 changes: 1 addition & 1 deletion distros/vanilla/.env_sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ WEBHOOK=/opt/payara/triggers/external-services.py
#doi_shoulder=doi_shoulder
#doi_username=doi_username
#doi_password=doi_password
dataciterestapiurlstring=https\\:\/\/api.test.datacite.org
dataciterestapiurlstring=https\:\/\/api.test.datacite.org
baseurlstring=https\:\/\/mds.test.datacite.org

# AWS settings
Expand Down
1 change: 1 addition & 0 deletions distros/vanilla/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ services:
- "doi_provider"
- "doi_username"
- "doi_password"
- "doi_shoulder"
- "dataciterestapiurlstring"
- "baseurlstring"
- "aws_bucket_name"
Expand Down
2 changes: 1 addition & 1 deletion distros/vanilla/init.d/03-doi-set.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ if [ "${doi_authority}" ]; then
asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options "-Ddoi.dataciterestapiurlstring\=${dataciterestapiurlstring}"
asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options "-Ddoi.baseurlstring\=${baseurlstring}"
if [ "${doi_shoulder}" ]; then
curl -X PUT -d "${doi_shoulder}/" "$SERVER/admin/settings/:Shoulder"
curl -X PUT -d "${doi_shoulder}/" http://localhost:8080/api/admin/settings/:Shoulder
fi
fi
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ services:
- "doi_provider"
- "doi_username"
- "doi_password"
- "doi_shoulder"
- "dataciterestapiurlstring"
- "baseurlstring"
- "aws_bucket_name"
Expand Down
2 changes: 1 addition & 1 deletion init.d/03-doi-set.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ if [ "${doi_authority}" ]; then
asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options "-Ddoi.dataciterestapiurlstring\=${dataciterestapiurlstring}"
asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options "-Ddoi.baseurlstring\=${baseurlstring}"
if [ "${doi_shoulder}" ]; then
curl -X PUT -d "${doi_shoulder}/" "$SERVER/admin/settings/:Shoulder"
curl -X PUT -d "${doi_shoulder}/" http://localhost:8080/api/admin/settings/:Shoulder
fi
fi