diff --git a/.env_sample b/.env_sample index 06fd44d..a8cc422 100644 --- a/.env_sample +++ b/.env_sample @@ -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 @@ -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 diff --git a/distros/vanilla/.env b/distros/vanilla/.env index 12622d0..bf8e8a7 100644 --- a/distros/vanilla/.env +++ b/distros/vanilla/.env @@ -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 diff --git a/distros/vanilla/.env_sample b/distros/vanilla/.env_sample index 785cdc8..f961993 100644 --- a/distros/vanilla/.env_sample +++ b/distros/vanilla/.env_sample @@ -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 diff --git a/distros/vanilla/docker-compose.yml b/distros/vanilla/docker-compose.yml index 9356ec2..4d39297 100644 --- a/distros/vanilla/docker-compose.yml +++ b/distros/vanilla/docker-compose.yml @@ -93,6 +93,7 @@ services: - "doi_provider" - "doi_username" - "doi_password" + - "doi_shoulder" - "dataciterestapiurlstring" - "baseurlstring" - "aws_bucket_name" diff --git a/distros/vanilla/init.d/03-doi-set.sh b/distros/vanilla/init.d/03-doi-set.sh index 29d3781..9dfe7ad 100644 --- a/distros/vanilla/init.d/03-doi-set.sh +++ b/distros/vanilla/init.d/03-doi-set.sh @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 6611777..c75cf57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -139,6 +139,7 @@ services: - "doi_provider" - "doi_username" - "doi_password" + - "doi_shoulder" - "dataciterestapiurlstring" - "baseurlstring" - "aws_bucket_name" diff --git a/init.d/03-doi-set.sh b/init.d/03-doi-set.sh index 29d3781..9dfe7ad 100644 --- a/init.d/03-doi-set.sh +++ b/init.d/03-doi-set.sh @@ -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