Bug 28386: Disambiguate Séverine (to squash)

[srvgit] / etc / koha-conf.xml

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 9e6cb59..118b6b8 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -14,19 +14,6 @@
 <listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
 -->
 
-<!-- Settings for special biblio server instance for PazPar2.
-     Because PazPar2 only connects to a Z39.50 server using TCP/IP,
-     it cannot use the Unix-domain socket that biblioserver uses.
-     Therefore, a custom server is defined. -->
-__PAZPAR2_TOGGLE_XML_PRE__
-<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
-<server id="mergeserver"  listenref="mergeserver"> 
-    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
-    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
-    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
-</server>
-__PAZPAR2_TOGGLE_XML_POST__
-
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver"> 
     <directory>__ZEBRA_DATA_DIR__/biblios</directory>
@@ -114,7 +101,6 @@ __PAZPAR2_TOGGLE_XML_POST__
  <!--
  <supportdir>__SCRIPT_NONDEV_DIR__</supportdir>
  -->
- <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
  <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 -->
@@ -162,10 +148,6 @@ __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 https://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>
@@ -182,6 +164,8 @@ __PAZPAR2_TOGGLE_XML_POST__
 
      <!-- See https://metacpan.org/pod/Search::Elasticsearch#cxn_pool -->
      <cxn_pool>Static</cxn_pool>
+     <!-- See https://metacpan.org/pod/Search::Elasticsearch#trace_to -->
+     <!-- <trace_to>Stderr</trace_to> -->
  </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> -->
@@ -227,6 +211,9 @@ __PAZPAR2_TOGGLE_XML_POST__
       server. e.g. Antarctica/South_Pole -->
  <timezone></timezone>
 
+ <!-- This is the bcryt settings used to generated anonymized content -->
+ <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
+
  <!-- 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
@@ -243,7 +230,7 @@ __PAZPAR2_TOGGLE_XML_POST__
     <repo>
         <name>Theke Solutions</name>
         <org_name>thekesolutions</org_name>
-        <service>github</service>
+        <service>gitlab</service>
     </repo>
     <repo>
         <name>PTFS Europe</name>
@@ -261,5 +248,23 @@ __PAZPAR2_TOGGLE_XML_POST__
  -->
  </koha_xslt_security>
 
+ <smtp_server>
+    <host>__SMTP_HOST__</host>
+    <port>__SMTP_PORT__</port>
+    <timeout>__SMTP_TIMEOUT__</timeout>
+    <ssl_mode>__SMTP_SSL_MODE__</ssl_mode>
+    <user_name>__SMTP_USER_NAME__</user_name>
+    <password>__SMTP_PASSWORD__</password>
+    <debug>__SMTP_DEBUG__</debug>
+ </smtp_server>
+
+ <message_broker>
+   <hostname>localhost</hostname>
+   <port>61613</port>
+   <username>guest</username>
+   <password>guest</password>
+   <vhost></vhost>
+ </message_broker>
+
 </config>
 </yazgfs>