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 <katrin.fischer.83@web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index f056138..5ff2535 100644 (file)
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -269,6 +269,10 @@ __END_SRU_PUBLICSERVER__
  <port>3306</port>
  <user>__DB_USER__</user>
  <pass>__DB_PASS__</pass>
+ <tls>__DB_USE_TLS__</tls>
+ <ca>__DB_TLS_CA_CERTIFICATE__</ca>
+ <cert>__DB_TLS_CLIENT_CERTIFICATE__</cert>
+ <key>__DB_TLS_CLIENT_KEY__</key>
  <biblioserver>biblios</biblioserver>
  <biblioservershadow>1</biblioservershadow>
  <authorityserver>authorities</authorityserver>
@@ -399,5 +403,12 @@ __END_SRU_PUBLICSERVER__
       server. e.g. Antarctica/South_Pole -->
  <timezone>__TIMEZONE__</timezone>
 
+ <!-- flag for development purposes
+      dev_install is used to adjust some paths specific to dev installations
+      strict_sql_modes should not be used in a production environement
+                       developers use it to catch bugs related to strict SQL modes -->
+ <dev_install>0</dev_install>
+ <strict_sql_modes>0</strict_sql_modes>
+
 </config>
 </yazgfs>

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index e769943..dcce3a3 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -102,6 +102,9 @@ __PAZPAR2_TOGGLE_XML_POST__
  <logdir>__LOG_DIR__</logdir>
  <docdir>__DOC_DIR__</docdir>
  <backupdir>__BACKUP_DIR__</backupdir>
+ <!-- URL of the mana KB server -->
+ <!-- alternative value http://mana-test.koha-community.org to query the test server -->
+ <mana_config>https://mana-kb.koha-community.org</mana_config>
  <!-- Enable the two following to allow superlibrarians to download
       database and configuration dumps (respectively) from the Export
       tool -->
@@ -117,8 +120,14 @@ __PAZPAR2_TOGGLE_XML_POST__
  <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
  <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
  <use_zebra_facets>1</use_zebra_facets>
+ <zebra_max_record_size>1024</zebra_max_record_size>
  <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
  <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
+ <!-- Uncomment/edit next setting if you want to adjust zebra log levels.
+      Default is: none,fatal,warn.
+      You can also include: debug,log,malloc,all,request.
+      Use a comma-separated list of levels to include. -->
+ <!-- <zebra_loglevels>none,fatal,warn</zebra_loglevels> -->
  <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
  <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
  <template_cache_dir>__TEMPLATE_CACHE_DIR__</template_cache_dir>
@@ -218,5 +227,12 @@ __PAZPAR2_TOGGLE_XML_POST__
       server. e.g. Antarctica/South_Pole -->
  <timezone></timezone>
 
+ <!-- flag for development purposes
+      dev_install is used to adjust some paths specific to dev installations
+      strict_sql_modes should not be used in a production environement
+                       developers use it to catch bugs related to strict SQL modes -->
+ <dev_install>0</dev_install>
+ <strict_sql_modes>0</strict_sql_modes>
+
 </config>
 </yazgfs>