diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml index 9d1a508..389a436 100644 --- a/group_vars/all/all.yml +++ b/group_vars/all/all.yml @@ -52,7 +52,7 @@ projectname: "ckan" ckan_fqdn: "ckan.minikube" ckan_site_url: "http://{{ ckan_fqdn }}" ckan_image: "ghcr.io/fjelltopp/fjelltopp-base-images/ckan" -ckan_image_tag: "2.9.8" +ckan_image_tag: "2.11.0" ckan_db_image: "postgres:15" # ckan_ds_ro_pass: "123456789" @@ -75,9 +75,9 @@ ckan_solr_url: "http://solr:8983/solr/ckan" ckan_plugins: "stats text_view image_view recline_view blob_storage authz_service" # CKAN Front-End Settings -ckan_site_title: "Document Management System" +ckan_site_title: "Fjelltopp" ckan_site_logo: "/images/logo.png" -ckan_site_description: "Department of HIV & AIDS, Ministry of Health, Malawi" +ckan_site_description: "Data Catalogue" ckan_favicon: "/images/favicon.ico" ckan_gravatar_default: "identicon" ckan_preview_direct: "png jpg gif" diff --git a/roles/ckan/templates/ckan/ckan_production.ini b/roles/ckan/templates/ckan/ckan_production.ini index 78025e1..7e683cc 100644 --- a/roles/ckan/templates/ckan/ckan_production.ini +++ b/roles/ckan/templates/ckan/ckan_production.ini @@ -25,20 +25,26 @@ ckan.devserver.host = localhost ckan.devserver.port = 5000 -## Session settings +## CKAN <2.11 Session settings cache_dir = /tmp/%(ckan.site_id)s/ beaker.session.key = ckan beaker.session.type = ext:redis beaker.session.url = redis://redis:6379/3 beaker.session.cookie_expires = 86400 beaker.session.timeout = 86400 - - # This is the secret token that the beaker library uses to hash the cookie sent # to the client. `ckan generate config` generates a unique value for this each # time it generates a config file. beaker.session.secret = {{ ckan_beaker_secret }} +## CKAN >=2.11 Session settings +SESSION_TYPE = redis +SESSION_COOKIE_NAME = ckan +SESSION_PERMANENT = true +PERMANENT_SESSION_LIFETIME = 86400 +# The secret token that is used for session management and other security related tasks as well +SECRET_KEY = {{ ckan_secret_key }} + # `ckan generate config` generates a unique value for this each time it generates # a config file. app_instance_uuid = 853f1fc8-aba1-411e-9071-44e3cdce64dd @@ -103,7 +109,7 @@ solr_timeout = 60 ## Redis Settings # URL to your Redis instance, including the database to be used. -#ckan.redis.url = redis://localhost:6379/0 +# ckan.redis.url = redis://localhost:6379/0 # Fjelltopp sets through ENV VAR ## CORS Settings diff --git a/roles/ckan/templates/kubernetes/ckan.yaml b/roles/ckan/templates/kubernetes/ckan.yaml index a6e9337..6e962f7 100644 --- a/roles/ckan/templates/kubernetes/ckan.yaml +++ b/roles/ckan/templates/kubernetes/ckan.yaml @@ -100,6 +100,7 @@ spec: args: - cd /usr/lib/ckan/; export HOME=/usr/lib/ckan/; + export PATH=/usr/lib/ckan/.minikubevenv/ckan-ALitmJXH/bin:$PATH; pipenv --version; pipenv sync --dev; rm -rf venv;