Merge pull request #11 from nfdi4health/fix/licence

fix(k8s.dataverse): Ensures that the licence are created during setup and custom terms are not allowed.
nfdi4health · Feb 29, 2024 · 1bce2f8 · 1bce2f8
2 parents 152be69 + dec185c
commit 1bce2f8
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 6 deletions.
diff --git a/k8s/dataverse/Chart.yaml b/k8s/dataverse/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.3
+version: 0.3.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/k8s/dataverse/persona/nfdi4health/init.sh b/k8s/dataverse/persona/nfdi4health/init.sh
@@ -46,6 +46,9 @@ while IFS= read -r TSV; do
   echo
 done <<< "${TSVS}"
 
+echo "Disable custom terms of use"
+curl -s -H "X-Dataverse-key:$API_TOKEN" -X PUT -d false $DATAVERSE_URL/aapi/admin/settings/:AllowCustomTermsOfUse
+
 echo "Creating users"
 USERS=$(find $USERS_PATH -maxdepth 1 -iname '*.json')
 while IFS= read -r USER; do

diff --git a/k8s/dataverse/persona/nfdi4health/licence/license-All-rights-reserved.json b/k8s/dataverse/persona/nfdi4health/licence/license-All-rights-reserved.json
@@ -4,5 +4,5 @@
   "shortDescription": "All rights reserved.",
   "iconUrl": "",
   "active": true,
-  "sortOrder": 8
+  "sortOrder": 7
 }
diff --git a/...nfdi4health/licence/licenseCC-BY-4.0.json → ...fdi4health/licence/license-CC-BY-4.0.json b/...nfdi4health/licence/licenseCC-BY-4.0.json → ...fdi4health/licence/license-CC-BY-4.0.json
diff --git a/...i4health/licence/licenseCC-BY-NC-4.0.json → ...4health/licence/license-CC-BY-NC-4.0.json b/...i4health/licence/licenseCC-BY-NC-4.0.json → ...4health/licence/license-CC-BY-NC-4.0.json
@@ -4,5 +4,5 @@
   "shortDescription": "Creative Commons Attribution-NonCommercial 4.0 International License.",
   "iconUrl": "https://licensebuttons.net/l/by-nc/4.0/88x31.png",
   "active": true,
-  "sortOrder": 4
+  "sortOrder": 5
 }
diff --git a/...ealth/licence/licenseCC-BY-NC-SA-4.0.json → ...alth/licence/license-CC-BY-NC-SA-4.0.json b/...ealth/licence/licenseCC-BY-NC-SA-4.0.json → ...alth/licence/license-CC-BY-NC-SA-4.0.json
diff --git a/...i4health/licence/licenseCC-BY-SA-4.0.json → ...4health/licence/license-CC-BY-SA-4.0.json b/...i4health/licence/licenseCC-BY-SA-4.0.json → ...4health/licence/license-CC-BY-SA-4.0.json
diff --git a/...a/nfdi4health/licence/licenseCC0-1.0.json → .../nfdi4health/licence/license-CC0-1.0.json b/...a/nfdi4health/licence/licenseCC0-1.0.json → .../nfdi4health/licence/license-CC0-1.0.json
@@ -4,5 +4,5 @@
   "shortDescription": "Creative Commons CC0 1.0 Universal Public Domain Dedication.",
   "iconUrl": "https://licensebuttons.net/p/zero/1.0/88x31.png",
   "active": true,
-  "sortOrder": 8
+  "sortOrder": 1
 }
diff --git a/k8s/dataverse/persona/nfdi4health/licence/license-Not-applicable.json b/k8s/dataverse/persona/nfdi4health/licence/license-Not-applicable.json
@@ -4,5 +4,5 @@
   "shortDescription": "Not applicable.",
   "iconUrl": "",
   "active": true,
-  "sortOrder": 8
+  "sortOrder": 6
 }
diff --git a/k8s/dataverse/persona/nfdi4health/licence/license-Not-assigned.json b/k8s/dataverse/persona/nfdi4health/licence/license-Not-assigned.json
@@ -0,0 +1,8 @@
+{
+  "name": "Not assigned",
+  "uri": "Not-assigned",
+  "shortDescription": "Not assigned.",
+  "iconUrl": "",
+  "active": true,
+  "sortOrder": 8
+}
diff --git a/k8s/dataverse/persona/nfdi4health/licence/license-Unknown.json b/k8s/dataverse/persona/nfdi4health/licence/license-Unknown.json
@@ -4,5 +4,5 @@
   "shortDescription": "Unknown.",
   "iconUrl": "",
   "active": true,
-  "sortOrder": 8
+  "sortOrder": 9
 }