set COMPRESS_OFFLINE=True

(cherry picked from commit 7edeaf643caad09781ae964d64b50453059f1be8)

Rewritten-From: 0d14acce1f9c0cf5edfa705e062e8854386bfc07

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 7df98f1ced364492301ef278a3badedad5844603..10ed204200c3de1b536eed7225fc16b6d44cd8ba 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,10 @@ horizon (2014.1~b2-1) experimental; urgency=low
   * Compress the CSS and JS during the postinst (Closes: #739698)
   * Add mysql in Uploaders
   * Bump standard version, no change needed
+  * Turns COMPRESS_OFFLINE to True since we now pre-compress the
+    CSS and the JS
+  * Add call "manage.py compress" with the --force parameter to avoid
+    a warning an harmless warning for the user.
 
   [ Thomas Goirand ]
   * New upstream release (Icehouse beta 1).

diff --git a/xenial/debian/openstack-dashboard.postinst b/xenial/debian/openstack-dashboard.postinst
index 8563d629fc5ebfba6f71803f5f9cf5ed105414a2..77a87c8e0cf47ee74f9024115c30753d25e0079b 100644 (file)
--- a/xenial/debian/openstack-dashboard.postinst
+++ b/xenial/debian/openstack-dashboard.postinst
@@ -17,7 +17,7 @@ if [ "$1" = "configure" ] ; then
        chown www-data:www-data /var/lib/openstack-dashboard/secret-key
 
     # Compress the JS and CSS with python-compressor and python-lesscpy
-       /usr/share/openstack-dashboard/manage.py compress
+       /usr/share/openstack-dashboard/manage.py compress --force
 fi
 
 #DEBHELPER#

diff --git a/xenial/debian/rules b/xenial/debian/rules
index c4d700a797f93733aa7483545b23eb9862cff787..e8db157af838140b50b6e91c199474fe62564c4c 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_install:
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
        sed -i -e 's/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH,/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join("\/","var","lib","openstack-dashboard","secret-key",/' \
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
+       echo "COMPRESS_OFFLINE=True" >> $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
 
        cp $(CURDIR)/manage.py \
                $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/