From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 8 Oct 2015 21:54:08 +0000 (+0000)
Subject:   * Fixed the issue with the file
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e16ddf0289f021fd76d44fce8e951b35e58b62ca;p=openstack-build%2Fhorizon-build.git

  * Fixed the issue with the file
    /var/lib/openstack-dashboard/secret-key/.secret_key_store not being
    writeable. What seems to happen is that compress, which is run as root,
    writes that file.

Rewritten-From: 623f3aa59f5c2d75f0b3d09f976968fd97270239
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index f82bf8f..1246ae9 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,12 @@
+horizon (2:8.0.0~rc1-2) UNRELEASED; urgency=medium
+
+  * Fixed the issue with the file
+    /var/lib/openstack-dashboard/secret-key/.secret_key_store not being
+    writeable. What seems to happen is that compress, which is run as root,
+    writes that file.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 08 Oct 2015 21:52:34 +0000
+
 horizon (2:8.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index 8df75b6..2a8b8c9 100644
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -43,6 +43,8 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
 			a2ensite openstack-dashboard.conf
 		fi
 		/usr/share/openstack-dashboard/manage.py compress --force
+		rm -f /var/lib/openstack-dashboard/secret-key/.secret_key_store
+		chown -R www-data /var/lib/openstack-dashboard/secret-key
 		invoke-rc.d --quiet apache2 reload
 	else
 		sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=no#' /etc/default/openstack-dashboard-apache
@@ -54,6 +56,8 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
 		a2dissite openstack-dashboard-ssl.conf
 		a2ensite openstack-dashboard-alias-only.conf
 		/usr/share/openstack-dashboard/manage.py compress --force
+		rm -f /var/lib/openstack-dashboard/secret-key/.secret_key_store
+		chown -R www-data /var/lib/openstack-dashboard/secret-key
 		invoke-rc.d --quiet apache2 reload
 	fi
 	db_stop
diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index 842da6c..3fbd521 100644
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -24,6 +24,8 @@ fi
 
 if [ "$1" = "triggered" ] ; then
 	/usr/share/openstack-dashboard/manage.py compress --force
+	rm /var/lib/openstack-dashboard/secret-key/.secret_key_store
+	chown -R www-data /var/lib/openstack-dashboard/secret-key
 fi
 
 #DEBHELPER#