Bug 16011 reintroduced VERSION variable needs declaration

[srvgit] / etc / koha-conf.xml

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 87b538a..c361846 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -6,11 +6,6 @@
 
 <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>
--->
 
 <!-- Uncomment the following entry if you want to run the public Z39.50 server.
     Also uncomment the <server> and <serverinfo> sections for id 'publicserver' 
@@ -93,6 +88,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <authorityservershadow>1</authorityservershadow>
  <pluginsdir>__PLUGINS_DIR__</pluginsdir>
  <enable_plugins>0</enable_plugins>
+ <upload_path></upload_path>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
@@ -106,27 +102,38 @@ __PAZPAR2_TOGGLE_XML_POST__
       tool -->
  <backup_db_via_tools>0</backup_db_via_tools>
  <backup_conf_via_tools>0</backup_conf_via_tools>
+ <!-- Uncomment the following line if you are not using packages and need to schedule reports through the web interface. supportdir should contain cronjobs/runreport.pl -->
+ <!--
+ <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 -->
  <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>
+ <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
+
+ <!-- Secret passphrase used by Mojolicious for signed cookies -->
+ <api_secret_passphrase>CHANGEME</api_secret_passphrase>
 
  <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
  <ttf>
-    <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
-    <font type="TB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font>
-    <font type="TI" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font>
-    <font type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font>
-    <font type="C"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font>
-    <font type="CB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font>
-    <font type="CO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font>
-    <font type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font>
-    <font type="H"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font>
-    <font type="HB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font>
-    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
+    <font type="TR" >__FONT_DIR__/DejaVuSerif.ttf</font>
+    <font type="TB" >__FONT_DIR__/DejaVuSerif-Bold.ttf</font>
+    <font type="TI" >__FONT_DIR__/DejaVuSerif-Italic.ttf</font>
+    <font type="TBI">__FONT_DIR__/DejaVuSerif-BoldItalic.ttf</font>
+    <font type="C"  >__FONT_DIR__/DejaVuSansMono.ttf</font>
+    <font type="CB" >__FONT_DIR__/DejaVuSansMono-Bold.ttf</font>
+    <font type="CO" >__FONT_DIR__/DejaVuSansMono-Oblique.ttf</font>
+    <font type="CBO">__FONT_DIR__/DejaVuSansMono-BoldOblique.ttf</font>
+    <font type="H"  >__FONT_DIR__/DejaVuSans.ttf</font>
+    <font type="HO" >__FONT_DIR__/DejaVuSans-Oblique.ttf</font>
+    <font type="HB" >__FONT_DIR__/DejaVuSans-Bold.ttf</font>
+    <font type="HBO">__FONT_DIR__/DejaVuSans-BoldOblique.ttf</font>
  </ttf>
 
 </config>