Bug 32030: yarn.lock - Update to Node14

[koha-ffzg.git] / etc / koha-conf.xml

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 2c95e2c..3e5623c 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -108,6 +108,7 @@
  <lockdir>__LOCK_DIR__</lockdir>
  <use_zebra_facets>1</use_zebra_facets>
  <zebra_max_record_size>1024</zebra_max_record_size>
+ <zebra_connection_timeout>30</zebra_connection_timeout>
  <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.
@@ -121,6 +122,10 @@
  <!-- Secret passphrase used by Mojolicious for signed cookies -->
  <api_secret_passphrase>CHANGEME</api_secret_passphrase>
 
+ <!-- default report results limit is 999,999. uncomment this and set a different number to override that limit.
+ <report_results_limit>999999</report_results_limit>
+ -->
+
  <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
  <!--
  <access_dirs>
@@ -211,9 +216,12 @@
       server. e.g. Antarctica/South_Pole -->
  <timezone></timezone>
 
- <!-- This is the bcryt settings used to generated anonymized content -->
+ <!-- This is the bcrypt settings used to generated anonymized content -->
  <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
 
+ <!-- Encryption key for crypted password or sensitive data -->
+ <encryption_key>__ENCRYPTION_KEY__</encryption_key>
+
  <!-- 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 environment
@@ -266,8 +274,10 @@
    <vhost></vhost>
  </message_broker>
 
+ <do_not_remove_cookie>catalogue_editor_\d+</do_not_remove_cookie>
  <!-- Uncomment lines like hereunder to not clear cookies at logout:
       The cookie name is case sensitive.
+      NOTE: You may use regex constructions like the example above.
      <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
  -->