Bug 17332: Include memcached configuration in koha-conf files

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

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index cb6ed05..1ce3c90 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -88,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>
@@ -115,21 +116,26 @@ __PAZPAR2_TOGGLE_XML_POST__
  <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>
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
+
+ <!-- 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="HO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.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>