Migrated ckan config from .env.dbca to dbca.ini

dbca-wa · Dec 19, 2023 · ebe9b6b · ebe9b6b
1 parent 90c070a
commit ebe9b6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.env.dbca b/.env.dbca
@@ -73,23 +73,9 @@ NGINX_PORT=80
 NGINX_SSLPORT=443
 
 # Extensions
-CKAN__PLUGINS="image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat dbca scheming_datasets envvars"
-CKAN__VIEWS__DEFAULT_VIEWS="text_view datatables_view pdf_view"
-CKAN__HARVEST__MQ__TYPE=redis
-CKAN__HARVEST__MQ__HOSTNAME=redis
-CKAN__HARVEST__MQ__PORT=6379
-CKAN__HARVEST__MQ__REDIS_DB=1
 
 ## WA DBCA Config ##
 # Docker compose project name
 COMPOSE_PROJECT_NAME=dbca
 # The docker compose file to use. Options are docker-compose.dev.yml (The default for local development) or docker-compose.prod.yml (To test production builds)
 DOCKER_COMPOSE=docker-compose.dev.yml
-
-# Internationalisation Settings
-CKAN__DISPLAY_TIMEZONE=Australia/Perth
-CKAN__RESOURCE_FORMATS=/srv/app/src_extensions/ckanext-dbca/ckanext/dbca/config/resource_formats.json
-
-# Scheming
-CKAN___SCHEMING__DATASET_SCHEMAS=ckanext.dbca:dbca_dataset.yaml
-CKAN___SCHEMING__PRESETS="ckanext.scheming:presets.json ckanext.dbca:dbca_presets.json"
diff --git a/ckan/config/dbca.ini b/ckan/config/dbca.ini
@@ -10,17 +10,21 @@ use = config:/srv/app/ckan.ini
 ckan.devserver.watch_patterns = /srv/app/ckan.ini
 
 ## Plugins Settings ############################################################
-ckan.plugins = image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat envvars
+ckan.plugins = image_view text_view datatables_view pdf_view datastore xloader pages showcase hierarchy_display hierarchy_form hierarchy_group_form dcat dbca scheming_datasets envvars
 
 ## Resource Views Settings #####################################################
 ckan.views.default_views = text_view datatables_view pdf_view
 
 ## Internationalisation Settings ###############################################
 ckan.locale_default = en_AU
-ckan.display_timezone = Australia/West
+ckan.display_timezone = Australia/Perth
+ckan.resource_formats = /srv/app/src_extensions/ckanext-dbca/ckanext/dbca/config/resource_formats.json
 
 ## CKAN Extensions configuration ###############################################
 
+# ckanext-scheming
+scheming.dataset_schemas = ckanext.dbca:dbca_dataset.yaml
+scheming.presets = ckanext.scheming:presets.json ckanext.dbca:dbca_presets.json
 
 ## Logging configuration
 [loggers]