Fixing up a regexp to stop a trivial warn

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

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 1c554e9..819cc55 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -6,6 +6,11 @@
 
 <listen id="biblioserver" >unix:__ZEBRA_RUN_DIR__/bibliosocket</listen>
 <listen id="authorityserver" >unix:__ZEBRA_RUN_DIR__/authoritysocket</listen>
+<!-- uncomment these lines and comment out the above if running on MSWin32 -->
+<!--
+<listen id="biblioserver" >tcp:localhost:9998/bibliosocket</listen>
+<listen id="authorityserver" >tcp:localhost:9999/authoritysocket</listen>
+-->
 <!-- public server runs on tcp -->
 <!-- <listen id="publicserver" >tcp:@:9999</listen> -->
 
@@ -13,12 +18,14 @@
      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-biblios.cfg</config>
     <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
 </server>
+__PAZPAR2_TOGGLE_XML_POST__
 
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver"> 
@@ -187,5 +194,9 @@
  <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
  <logdir>__LOG_DIR__</logdir>
  <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 -->
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
 </config>
 </yazgfs>