X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=etc%2Fkoha-conf.xml;h=daec94d85cab2ddcd48240de7c1bb9f19d91c839;hb=ef0c31f735cf68a3b004c706e274ede4bb883940;hp=37b304c2db36f8fc34b04f2250279a8c41bcc9c3;hpb=0f9ec1287539e61f4dd089131cf69cb90fb3f8e2;p=koha-ffzg.git

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 37b304c2db..daec94d85c 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -93,6 +93,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <pluginsdir>__PLUGINS_DIR__</pluginsdir> <!-- This entry can be repeated to use multiple directories -->
  <enable_plugins>0</enable_plugins>
  <upload_path></upload_path>
+ <tmp_path></tmp_path>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
@@ -114,8 +115,6 @@ __PAZPAR2_TOGGLE_XML_POST__
  <install_log>__MISC_DIR__/koha-install-log</install_log>
  <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
  <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
- <zebra_bib_index_mode>__BIB_INDEX_MODE__</zebra_bib_index_mode>
- <zebra_auth_index_mode>__AUTH_INDEX_MODE__</zebra_auth_index_mode>
  <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
  <use_zebra_facets>1</use_zebra_facets>
  <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
@@ -128,7 +127,12 @@ __PAZPAR2_TOGGLE_XML_POST__
  <api_secret_passphrase>CHANGEME</api_secret_passphrase>
 
  <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->
- <!-- <access_dir></access_dir> -->
+ <!--
+ <access_dirs>
+     <access_dir></access_dir>
+     <access_dir></access_dir>
+ </access_dirs>
+ -->
 
  <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
  <ttf>
@@ -149,6 +153,10 @@ __PAZPAR2_TOGGLE_XML_POST__
  <!-- Path to the config file for SMS::Send -->
  <sms_send_config>__KOHA_CONF_DIR__/sms_send/</sms_send_config>
 
+ <!-- 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>
+
  <!-- Configuration for Plack -->
  <plack_max_requests>50</plack_max_requests>
  <plack_workers>2</plack_workers>
@@ -157,6 +165,9 @@ __PAZPAR2_TOGGLE_XML_POST__
  <elasticsearch>
      <server>localhost:9200</server>
      <index_name>koha___DB_NAME__</index_name>
+
+     <!-- See https://metacpan.org/pod/Search::Elasticsearch#cxn_pool -->
+     <cxn_pool>Static</cxn_pool>
  </elasticsearch>
  <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
  <!-- <elasticsearch_index_config>__KOHA_CONF_DIR__/searchengine/elasticsearch/index_config.yaml</elasticsearch_index_config> -->
@@ -173,6 +184,13 @@ __PAZPAR2_TOGGLE_XML_POST__
      <!-- Path to where Illbackends are located on the system
           - This setting should normally not be touched -->
      <backend_directory>__PERL_MODULE_DIR__/Koha/Illbackends</backend_directory>
+     <!-- At least one <branch> block is required. -->
+     <branch>
+         <!-- The code of this branch -->
+         <code>CPL</code>
+         <!-- An optional prefix for all ILL request IDs for this branch -->
+         <prefix>ILL</prefix>
+     </branch>
      <!-- How should we treat staff comments?
           - hide: don't show in OPAC
           - show: show in OPAC -->