Merge branch 'develop'

dbca-wa · Oct 31, 2024 · 62a6cb0 · 62a6cb0
2 parents 099de69 + 3d84d2d
commit 62a6cb0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.env.dbca b/.env.dbca
@@ -87,6 +87,14 @@ CKANEXT__DOI__TEST_MODE=True
 ## ckanext-spatial ##
 CKANEXT__SPATIAL__COMMON_MAP__APIKEY=
 
+## ckanext-saml2auth ##
+# # Staging
+# CKANEXT__SAML2AUTH__IDP_METADATA__LOCAL_PATH=/srv/app/saml/dbca_staging_idp.xml
+# CKANEXT__SAML2AUTH__ENTITY_ID=urn:mace:umu.se:saml:ckan_dbca_staging:sp
+# # Production
+# CKANEXT__SAML2AUTH__IDP_METADATA__LOCAL_PATH=/srv/app/saml/dbca_prod_idp.xml
+# CKANEXT__SAML2AUTH__ENTITY_ID=urn:mace:umu.se:saml:ckan_dbca_prod:sp
+
 ## WA DBCA Config ##
 # Docker compose project name
 COMPOSE_PROJECT_NAME=dbca

diff --git a/ckan/config/dbca.ini b/ckan/config/dbca.ini
@@ -47,9 +47,16 @@ ckanext.spatial.common_map.type = Stadia.StamenTerrain
 scheming.dataset_schemas = ckanext.dbca:dbca_dataset.yaml
 
 # ckanext-doi
+# The below will be set via a environment variables
+# CKANEXT__DOI__ACCOUNT_NAME
+# ckanext.doi.account_name
+# CKANEXT__DOI__ACCOUNT_PASSWORD
+# ckanext.doi.account_password
+# CKANEXT__DOI__PREFIX
+# ckanext.doi.prefix
+# CKANEXT__DOI__TEST_MODE
+# ckanext.doi.test_mode
 ckanext.doi.publisher = Department of Biodiversity, Conservation and Attractions
-ckanext.doi.prefix = 10.82800
-ckanext.doi.test_mode = True
 ckanext.doi.language = en
 
 # ckanext-showcase