From 1d12cf31bad3df6a95ed2d9765d7614ae9c0e1ee Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 5 Nov 2019 11:23:04 +0100 Subject: [PATCH] Bug 22857: Sync koha-conf.xml files Missing entries are added to those files. Test plan: Search for typos Compare the two files and comfirm the entries are the same in both. Exception: supportdir exists in etc/koha-conf.xml only, but I think it's obsolete. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit eaf4b79c32a6f173db8177b8ee365ec10f4532a6) Signed-off-by: Fridolin Somers --- debian/templates/koha-conf-site.xml.in | 11 +++++++++++ etc/koha-conf.xml | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index e9e562439d..69cbe3dc0e 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -269,6 +269,10 @@ __END_SRU_PUBLICSERVER__ 3306 __DB_USER__ __DB_PASS__ + __DB_USE_TLS__ + __DB_TLS_CA_CERTIFICATE__ + __DB_TLS_CLIENT_CERTIFICATE__ + __DB_TLS_CLIENT_KEY__ biblios 1 authorities @@ -394,5 +398,12 @@ __END_SRU_PUBLICSERVER__ server. e.g. Antarctica/South_Pole --> __TIMEZONE__ + + 0 + 0 + diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index fc7c7cfead..f3ed58b3d6 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -102,6 +102,9 @@ __PAZPAR2_TOGGLE_XML_POST__ __LOG_DIR__ __DOC_DIR__ __BACKUP_DIR__ + + + https://mana-kb.koha-community.org @@ -117,8 +120,14 @@ __PAZPAR2_TOGGLE_XML_POST__ 0 __ZEBRA_LOCK_DIR__ 1 + 1024 __KOHA_CONF_DIR__/searchengine/queryparser.yaml __KOHA_CONF_DIR__/log4perl.conf + + __MEMCACHED_SERVERS__ __MEMCACHED_NAMESPACE__ __TEMPLATE_CACHE_DIR__ @@ -213,5 +222,12 @@ __PAZPAR2_TOGGLE_XML_POST__ server. e.g. Antarctica/South_Pole --> + + 0 + 0 + -- 2.39.5