use new settings in install

IQSS · Feb 14, 2024 · 47885b3 · 47885b3
1 parent 7106ef6
commit 47885b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/scripts/api/setup-all.sh b/scripts/api/setup-all.sh
@@ -57,10 +57,6 @@ echo  "- Allow internal signup"
 curl -X PUT -d yes "${DATAVERSE_URL}/api/admin/settings/:AllowSignUp"
 curl -X PUT -d "/dataverseuser.xhtml?editMode=CREATE" "${DATAVERSE_URL}/api/admin/settings/:SignUpUrl"
 
-curl -X PUT -d doi "${DATAVERSE_URL}/api/admin/settings/:Protocol"
-curl -X PUT -d 10.5072 "${DATAVERSE_URL}/api/admin/settings/:Authority"
-curl -X PUT -d "FK2/" "${DATAVERSE_URL}/api/admin/settings/:Shoulder"
-curl -X PUT -d DataCite "${DATAVERSE_URL}/api/admin/settings/:DoiProvider"
 curl -X PUT -d burrito "${DATAVERSE_URL}/api/admin/settings/BuiltinUsers.KEY"
 curl -X PUT -d localhost-only "${DATAVERSE_URL}/api/admin/settings/:BlockedApiPolicy"
 curl -X PUT -d 'native/http' "${DATAVERSE_URL}/api/admin/settings/:UploadMethods"

diff --git a/scripts/installer/as-setup.sh b/scripts/installer/as-setup.sh
@@ -106,9 +106,15 @@ function preliminary_setup()
   # (we can no longer offer EZID with their shared test account)
   # jvm-options use colons as separators, escape as literal
   DOI_BASEURL_ESC=`echo $DOI_BASEURL | sed -e 's/:/\\\:/'`
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.datacite.username=${DOI_USERNAME}"
-  ./asadmin $ASADMIN_OPTS create-jvm-options '\-Ddataverse.pid.datacite.password=${ALIAS=doi_password_alias}'
-  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.datacite.mds-api-url=$DOI_BASEURL_ESC"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.providers=testDC"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.type=datacite"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.label=TestDataCite"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.authority=10.5072"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.shoulder=FK2/"
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.datacite.username=${DOI_USERNAME}"
+  ./asadmin $ASADMIN_OPTS create-jvm-options '\-Ddataverse.pid.testDC.datacite.password=${ALIAS=doi_password_alias}'
+  ./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddataverse.pid.testDC.datacite.mds-api-url=$DOI_BASEURL_ESC"
+
 
   # jvm-options use colons as separators, escape as literal
   DOI_DATACITERESTAPIURL_ESC=`echo $DOI_DATACITERESTAPIURL | sed -e 's/:/\\\:/'`