Store settings.py in /etc

Signed-off-by: Julien Danjou <julien@danjou.info>
Rewritten-From: 86b4d9b2893646f57d2b4b1d20202eb40125fb5e

diff --git a/trusty/debian/control b/trusty/debian/control
index 20fd2169f88b77895a9244ff6dcfc6a71afeeb49..7228d145f4b91312c6d76e53efc9d814996eac82 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -21,7 +21,7 @@ Description: Django module to provide web interaction with OpenStack
 
 Package: openstack-dashboard
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-django-horizon, python-django
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-django-horizon, python-django, python-openstackx
 Description: OpenStack Dashboard
  The OpenStack Dashboard is a Web application allowing to control an
  OpenStack cloud.
\ No newline at end of file

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 1b11f0d2e001997c2eaf76effc6a1ac2f863ec9c..e349dc8b9cec9092364c3a22d2cec597123e8244 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -20,9 +20,11 @@ override_dh_auto_install:
        # Actually the setup.py from openstack-dashboard does not install anything…
        install -d -m 755  $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
        cp -a $(CURDIR)/openstack-dashboard/dashboard $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
+       cp -a $(CURDIR)/openstack-dashboard/local $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
        install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
-       mv $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/dashboard/settings.py $(CURDIR)/debian/tmp/etc/openstack-dashboard
-       ln -s /etc/openstask-dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/dashboard/settings.py
+       cp $(CURDIR)/openstack-dashboard/local/local_settings.py.example \
+               $(CURDIR)/debian/tmp/etc/openstack-dashboard/settings.py
+       ln -s /etc/openstack-dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/local/local_settings.py
 
 override_dh_auto_clean:
        dh_auto_clean