Merge branch 'develop'

dbca-wa · Aug 7, 2024 · 0c3b382 · 0c3b382
2 parents a5f8508 + d79a0f3
commit 0c3b382
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -69,7 +67,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

diff --git 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/ckan/saml/dbca_prod_sp.xml b/ckan/saml/dbca_prod_sp.xml
@@ -0,0 +1,7 @@
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:umu.se:saml:ckan_dbca_prod:sp">
+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.bio.wa.gov.au/acs" index="1" />
+        <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.bio.wa.gov.au/slo" />
+    </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/ckan/saml/dbca_staging_sp.xml b/ckan/saml/dbca_staging_sp.xml
@@ -1,7 +1,7 @@
 <ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:umu.se:saml:ckan_dbca_staging:sp">
     <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
         <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.bdr.wa.gov.au/acs" index="1" />
-        <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.bdr.wa.gov.au/slo" />
+        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data-test.bdr.wa.gov.au/acs" index="1" />
+        <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data-test.bdr.wa.gov.au/slo" />
     </ns0:SPSSODescriptor>
 </ns0:EntityDescriptor>
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -29,7 +29,7 @@ services:
       redis:
         condition: service_healthy
     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

diff --git 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;