Bug 17332: Remove memcached config from apache files

This patch removes Memcached configurations from the shipped apache files.

Note: testing is not actually needed for this patch, as it is really trivial. But I
include testing steps, just in case QA members require it.

To test:
- Apply the patch
- Do a (standard/dev/single) Koah install
=> SUCCESS: Verify the resulting koha-httpd.conf file doens't include memcached data
- Have a packages install
- Replace
  * /etc/koha/apache-site-https.conf.in
  * /etc/koha/apache-site.conf.in
  with the ones from this patch
- Create an instance
=> SUCCESS: The apache configuration doesn't include memcached configurations
- Sign off :-D

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>

diff --git a/debian/templates/apache-site-https.conf.in b/debian/templates/apache-site-https.conf.in
index 44a4fc8..b0f6883 100644 (file)
--- a/debian/templates/apache-site-https.conf.in
+++ b/debian/templates/apache-site-https.conf.in
@@ -30,8 +30,6 @@
 
    ServerName __OPACSERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
@@ -60,8 +58,6 @@
 
    ServerName __INTRASERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log

diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index 3f7ad52..654674d 100644 (file)
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -12,8 +12,6 @@
 
    ServerName __OPACSERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
@@ -30,11 +28,9 @@
 #  Include /etc/koha/apache-shared-disable.conf
 #  Include /etc/koha/apache-shared-intranet-plack.conf
    Include /etc/koha/apache-shared-intranet.conf
-   
+
    ServerName __INTRASERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 7c212d8..2747791 100644 (file)
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -17,8 +17,6 @@
 #  TransferLog __LOG_DIR__/koha-opac-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
 
    # This syntax allows you to override a system preference
    # for a given virtual host. Use with caution!
@@ -145,8 +143,6 @@
 #  TransferLog __LOG_DIR__/koha-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
-   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    Options +FollowSymLinks
 
    # If you are overriding any system preferences,