Recommends: memcached and use it as default on localhost.

Rewritten-From: 782fc88152e882b8494de02cec3c816402c0faf7

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index d5c1477a162e5dc4cb2c6b4a1a6c47e84d859bac..ce80f63c87e39692e133d98cd2ef4f47594c3643 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,7 +1,11 @@
 horizon (2012.2-1) experimental; urgency=low
 
+  [ Mehdi Abaakouk ]
   * New upstream release 2012.2
 
+  [ Thomas Goirand ]
+  * Recommends: memcached and use it as default on localhost.
+
  -- Mehdi Abaakouk <sileht@sileht.net>  Sat, 29 Sep 2012 09:38:19 +0200
 
 horizon (2012.2~rc1-1) experimental; urgency=low

diff --git a/xenial/debian/control b/xenial/debian/control
index d6de1a766a321825dd09c46e8a2f27afdb276d57..599b0459328756983688d5f661b6327d45cbe50f 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -65,6 +65,7 @@ Depends: ${shlibs:Depends},
  libjs-jquery-cookie,
  adduser,
  libapache2-mod-wsgi (>= 2.3)
+Recommends: memcached
 Description: OpenStack Dashboard
  The OpenStack Dashboard is a Web application allowing to control an
  OpenStack cloud.

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 12a6305155d609ef68b2ab6cc14ee71628682ad6..5eb0814affc127c480c25a93a17617e7b41385ff 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -19,8 +19,12 @@ override_dh_auto_install:
 
        cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
 
+       # Sets memcached by default in local_settings.py
        cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
+       sed -i -e 's|^[ \t#]*CACHE_BACKEND[ \t#]*=.*|CACHE_BACKEND = memcached://127.0.0.1:11211/|' \
+               $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
+
        cp $(CURDIR)/manage.py \
                $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
        ln -fs /etc/openstack-dashboard/local_settings.py \