Bugzilla – Attachment 95184 Details for
Bug 22857
Entries missing in koha-conf.xml
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22857: Sync koha-conf.xml files
Bug-22857-Sync-koha-confxml-files.patch (text/plain), 3.88 KB, created by
Marcel de Rooy
on 2019-11-08 09:02:31 UTC
(
hide
)
Description:
Bug 22857: Sync koha-conf.xml files
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2019-11-08 09:02:31 UTC
Size:
3.88 KB
patch
obsolete
>From 3222abca7c0bdceaa65755625a97b4e0cc605511 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 5 Nov 2019 11:23:04 +0100 >Subject: [PATCH] Bug 22857: Sync koha-conf.xml files >Content-Type: text/plain; charset=utf-8 > >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> >--- > 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 f056138cf2..5ff25359c8 100644 >--- 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 e7699436a7..dcce3a3ea5 100644 >--- 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> >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22857
:
95045
|
95048
| 95184 |
95185