From 1c957af7bc0b701412cf5846d878523a553f79e0 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Fri, 23 Sep 2016 11:28:58 -0300
Subject: [PATCH] Bug 17332: Include memcached configuration in koha-conf files

This patch introduces the memcached_servers and memcached_namespace
configuration entries as expected by 11921.

Note: better test this one and the followup together to ease the process.

To test:
- Do a source Koha install (dev, standard, single)
=> SUCCESS: The resulting koha-conf.xml file includes the memcached_* entries
   which are filled with the right values.
- In kohadevbox (packages setup):
- Replace /etc/koha/koha-conf-site.xml.in with the one from this patch
- Create a new koha instance
=> SUCCESS: The instance's koha-conf.xml includes the relevant entries
- Sign off

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 debian/templates/koha-conf-site.xml.in | 2 ++
 etc/koha-conf.xml                      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 25ac1826b1..8f7af30863 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -289,6 +289,8 @@ __END_SRU_PUBLICSERVER__
       You can also include: debug,log,malloc,all,request.
       Use a comma-separated list of levels to include. -->
  <!-- <zebra_loglevels>none,fatal,warn</zebra_loglevels> -->
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
 
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
  <ttf>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index c3618469b1..1ce3c9094e 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -116,6 +116,8 @@ __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>
-- 
2.39.5