From 515672c170624c2ac1b3649d3a5cc8964a9a91da Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 30 Nov 2019 22:51:42 +0100
Subject: [PATCH] Update CKAN conf files to 2.9

---
 .../ckan/ckan-datapusher.lxc/bin/add-ca-cert  |  0
 lxc-apps/ckan/install/ckan_conf/ckan.ini      | 21 ++++++++++++-------
 lxc-apps/ckan/install/ckan_conf/who.ini       |  9 ++------
 3 files changed, 16 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 lxc-apps/ckan/ckan-datapusher.lxc/bin/add-ca-cert

diff --git a/lxc-apps/ckan/ckan-datapusher.lxc/bin/add-ca-cert b/lxc-apps/ckan/ckan-datapusher.lxc/bin/add-ca-cert
old mode 100644
new mode 100755
diff --git a/lxc-apps/ckan/install/ckan_conf/ckan.ini b/lxc-apps/ckan/install/ckan_conf/ckan.ini
index ade7343..69a4c5b 100644
--- a/lxc-apps/ckan/install/ckan_conf/ckan.ini
+++ b/lxc-apps/ckan/install/ckan_conf/ckan.ini
@@ -13,8 +13,9 @@
 
 [DEFAULT]
 
-# WARNING: *THIS SETTING MUST BE SET TO FALSE ON A PRODUCTION ENVIRONMENT*
-debug = true
+# WARNING: *THIS SETTING MUST BE SET TO FALSE ON A PUBLIC ENVIRONMENT*
+# With debug mode enabled, a visitor to your site could execute malicious commands.
+debug = false
 
 [server:main]
 use = egg:Paste#http
@@ -54,6 +55,7 @@ ckan.datastore.read_url = postgresql://ckan_datastore:${CKAN_DS_PWD}@ckan-postgr
 ckan.datastore.default_fts_lang = english
 ckan.datastore.default_fts_index_method = gist
 
+
 ## Site Settings
 
 ckan.site_url = https://ckan.spotter.vm
@@ -71,6 +73,8 @@ ckan.auth.user_delete_organizations = false
 ckan.auth.create_user_via_api = false
 ckan.auth.create_user_via_web = true
 ckan.auth.roles_that_cascade_to_sub_groups = admin
+ckan.auth.public_user_details = true
+ckan.auth.public_activity_stream_detail = true
 
 
 ## Search Settings
@@ -130,10 +134,6 @@ ckan.datasetthumbnail.auto_generate = true
 
 ## Front-End Settings
 
-# Uncomment following configuration to enable using of Bootstrap 2
-#ckan.base_public_folder = public-bs2
-#ckan.base_templates_folder = templates-bs2
-
 ckan.site_title = CKAN
 ckan.site_logo = /base/images/ckan-logo.png
 ckan.site_description =
@@ -146,7 +146,6 @@ ckan.display_timezone = server
 # package_hide_extras = for_search_index_only
 #package_edit_return_url = http://another.frontend/dataset/<NAME>
 #package_new_return_url = http://another.frontend/dataset/<NAME>
-#ckan.recaptcha.version = 1
 #ckan.recaptcha.publickey =
 #ckan.recaptcha.privatekey =
 #licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json
@@ -172,6 +171,11 @@ ckan.storage_path = /srv/ckan/storage
 ckan.max_resource_size = 100
 ckan.max_image_size = 10
 
+## Webassets Settings
+#ckan.webassets.use_x_sendfile = false
+#ckan.webassets.path = /var/lib/ckan/webassets
+
+
 ## Datapusher settings
 
 # Make sure you have set up the DataStore
@@ -204,7 +208,10 @@ smtp.starttls = False
 #smtp.user = username@example.com
 #smtp.password = your_password
 smtp.mail_from = admin@example.com
+#smtp.reply_to =
 
+## Background Job Settings
+ckan.jobs.timeout = 180
 
 ## Logging configuration
 [loggers]
diff --git a/lxc-apps/ckan/install/ckan_conf/who.ini b/lxc-apps/ckan/install/ckan_conf/who.ini
index 885a497..eb2a5a5 100644
--- a/lxc-apps/ckan/install/ckan_conf/who.ini
+++ b/lxc-apps/ckan/install/ckan_conf/who.ini
@@ -1,10 +1,10 @@
 [plugin:auth_tkt]
-use = ckan.lib.auth_tkt:make_plugin
+use = ckan.lib.repoze_plugins.auth_tkt:make_plugin
 # If no secret key is defined here, beaker.session.secret will be used
 #secret = somesecret
 
 [plugin:friendlyform]
-use = repoze.who.plugins.friendlyform:FriendlyFormPlugin
+use = ckan.lib.repoze_plugins.friendly_form:FriendlyFormPlugin
 login_form_url= /user/login
 login_handler_path = /login_generic
 logout_handler_path = /user/logout
@@ -13,10 +13,6 @@ post_login_url = /user/logged_in
 post_logout_url = /user/logged_out
 charset = utf-8
 
-#[plugin:basicauth]
-#use = repoze.who.plugins.basicauth:make_plugin
-#realm = 'CKAN'
-
 [general]
 request_classifier = repoze.who.classifiers:default_request_classifier
 challenge_decider = repoze.who.classifiers:default_challenge_decider
@@ -34,4 +30,3 @@ plugins =
 [challengers]
 plugins =
     friendlyform;browser
-#   basicauth