Merge remote branch 'kc/new/bug_4885' into kcmaster

[srvgit] / etc / koha-conf.xml

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 3c4da9c..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> -->
 
@@ -190,5 +195,8 @@ __PAZPAR2_TOGGLE_XML_POST__
  <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>