X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=etc%2Fkoha-conf.xml;h=e627fc6af5c34dbf3285cb5887de89d396b74bc0;hb=f4eb63c7284625f3e16f741726f23fc44ec63e16;hp=1c554e9a611c08f772ce80446966f812ee1b4ecb;hpb=6a5b9194d5bf9891895cd6d4f91ebc4661c30506;p=koha.git

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 1c554e9a61..e627fc6af5 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -13,12 +13,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 +189,7 @@
  <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 -->
 </config>
 </yazgfs>