From 9cfacd63fe020356dcffe6c1015342d3357319b1 Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:42:09 +0200
Subject: [PATCH 1/7] adding doi_shoulder

adding "doi_shoulder" variable to environment of dataverse container
---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

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"

From 37e6903c570d9aca4971c00f8a76a5c8a22cc7ad Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:44:29 +0200
Subject: [PATCH 2/7] fixing url of doi_doi_shoulder

---
 init.d/03-doi-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From e49a6f5b10481ed75916f32f5c821a3b8b6ca29f Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:48:00 +0200
Subject: [PATCH 3/7] fixing dataciterestapiurlstring

---
 .env_sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 33bd92eeb2749b1b0080fcac5446e60524a686da Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:48:50 +0200
Subject: [PATCH 4/7] fixing dataciterestapiurlstring

---
 distros/vanilla/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 77e21b93bbed1279bee0a0ba389ce7c3636eefe0 Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:49:45 +0200
Subject: [PATCH 5/7] adding "doi_shoulder" variable

---
 distros/vanilla/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

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"

From 5e0ba259aa105c3728ad4e28cf5d9d1051a3a1fd Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:50:38 +0200
Subject: [PATCH 6/7] fixing doi_soulder url

---
 distros/vanilla/init.d/03-doi-set.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 5968bac898144324847f412351bd7be966816e3a Mon Sep 17 00:00:00 2001
From: schorcht-ioer <123582538+schorcht-ioer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:53:37 +0200
Subject: [PATCH 7/7]  .env_sample with example of configuration

---
 distros/vanilla/.env_sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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