From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Tue, 4 Aug 2015 19:43:24 +0000 (+0300)
Subject: Fixes related to WEBROOT
X-Git-Tag: mos-9.0~18
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c65936bd3059ba608b4f46b76eea69f5a4b2594e;p=openstack-build%2Fhorizon-build.git
Fixes related to WEBROOT
* add manage.py collectstaic call in postinst
* removed python-unittest2 from build-confilcts
Change-Id: Ieb71dc366f47b4fea2fe0d18aad9800b8b4f9c93
---
diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 9f5e7fd..568a8c0 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+horizon (1:2015.1.0-1~u14.04+mos6) mos7.0; urgency=medium
+
+ * Removed python-unittest2 from build-conflicts
+ * Add manage.py collectstatic
+
+ -- Igor Yozhikov <iyozhikov@mirantis.com> Thu, 4 Aug 2015 22:42:51 +0300
+
horizon (1:2015.1.0-1~u14.04+mos5) mos7.0; urgency=medium
[ Daniil Trishkin ]
diff --git a/trusty/debian/control b/trusty/debian/control
index f718e99..22aafc2 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -78,7 +78,6 @@ Build-Depends-Indep: gettext,
python-xstatic-term.js,
python-yaml,
Build-Conflicts: python-rednose,
- python-unittest2,
Standards-Version: 3.9.3
Homepage: http://launchpad.net/horizon
diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index 688c967..d941c71 100644
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -45,7 +45,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
chown -R horizon /var/lib/openstack-dashboard/secret-key
chmod 775 /var/lib/openstack-dashboard
- /usr/share/openstack-dashboard/manage.py compress --force
+ /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput && /usr/share/openstack-dashboard/manage.py compress --force
A22_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
@@ -74,7 +74,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
fi
if [ "$1" = "triggered" ] ; then
- /usr/share/openstack-dashboard/manage.py compress --force
+ /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput && /usr/share/openstack-dashboard/manage.py compress --force
fi
#DEBHELPER#