From 38d1a11265291d24bd6a8ea82420adf8d7e73701 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Wed, 10 Jul 2024 13:45:32 -0400 Subject: [PATCH 1/4] envvars last plugin in .env.example envvars should be last in the list of plugins so that other plugins can read/update the values it sets --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 830cf949..74ba958c 100644 --- a/.env.example +++ b/.env.example @@ -69,7 +69,7 @@ NGINX_PORT=80 NGINX_SSLPORT=443 # Extensions -CKAN__PLUGINS="envvars image_view text_view datatables_view datastore datapusher" +CKAN__PLUGINS="image_view text_view datatables_view datastore datapusher envvars" CKAN__HARVEST__MQ__TYPE=redis CKAN__HARVEST__MQ__HOSTNAME=redis CKAN__HARVEST__MQ__PORT=6379 From 18fbe445c1782d887f6ac77813e507d529246b53 Mon Sep 17 00:00:00 2001 From: Ian Ward Date: Wed, 10 Jul 2024 14:46:00 -0400 Subject: [PATCH 2/4] remove broken, confusing CKAN_PORT setting --- .env.example | 2 -- README.md | 3 --- docker-compose.dev.yml | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 830cf949..3e556ea1 100644 --- a/.env.example +++ b/.env.example @@ -30,8 +30,6 @@ USE_HTTPS_FOR_DEV=false CKAN_VERSION=2.10.0 CKAN_SITE_ID=default CKAN_SITE_URL=https://localhost:8443 -CKAN_PORT=5000 -CKAN_PORT_HOST=5000 CKAN___BEAKER__SESSION__SECRET=CHANGE_ME # See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME diff --git a/README.md b/README.md index 6021a4d1..4756a9c5 100644 --- a/README.md +++ b/README.md @@ -248,9 +248,6 @@ ckan Add these lines to the `ckan-dev` service in the docker-compose.dev.yml file ```yaml -ports: - - "0.0.0.0:${CKAN_PORT}:5000" - stdin_open: true tty: true ``` diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b1a56a49..72cd4a85 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -21,7 +21,7 @@ services: - solr - redis ports: - - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" + - "0.0.0.0:${CKAN_PORT_HOST}:5000" volumes: - ckan_storage:/var/lib/ckan - ./src:/srv/app/src_extensions From dad314f92437ec46bf5fcef40669e34a77f4032b Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Tue, 16 Jul 2024 09:43:22 +0800 Subject: [PATCH 3/4] Added prod saml config and updated staging domain --- ckan/saml/dbca_prod_sp.xml | 7 +++++++ ckan/saml/dbca_staging_sp.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 ckan/saml/dbca_prod_sp.xml diff --git a/ckan/saml/dbca_prod_sp.xml b/ckan/saml/dbca_prod_sp.xml new file mode 100644 index 00000000..8c973376 --- /dev/null +++ b/ckan/saml/dbca_prod_sp.xml @@ -0,0 +1,7 @@ + + + urn:oasis:names:tc:SAML:2.0:nameid-format:persistent + + + + diff --git a/ckan/saml/dbca_staging_sp.xml b/ckan/saml/dbca_staging_sp.xml index 8b5ef7e8..2945076d 100644 --- a/ckan/saml/dbca_staging_sp.xml +++ b/ckan/saml/dbca_staging_sp.xml @@ -1,7 +1,7 @@ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent - - + + From d79a0f3ecd8709b7d574916109963b319ded3709 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Wed, 7 Aug 2024 12:04:39 +0800 Subject: [PATCH 4/4] Removed CKAN_PORT env variables to match upstream fork removing it. https://github.com/ckan/ckan-docker/pull/160 --- nginx/setup/default.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/setup/default.conf.template b/nginx/setup/default.conf.template index 76e8aab7..5951c153 100644 --- a/nginx/setup/default.conf.template +++ b/nginx/setup/default.conf.template @@ -27,7 +27,7 @@ server { client_max_body_size 100M; location / { - proxy_pass http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}/; + proxy_pass http://${CKAN_CONTAINER_NAME}:5000/; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header Host $host; #proxy_cache cache;