use horizon user to run the WSGI process

(cherry picked from commit fc690ff9570abbd2409c4520a8ad4b44e43d244f)

Rewritten-From: 6427db82d3114b43f7cb7e2b93e4c0ede3449ec6

diff --git a/xenial/debian/apache-sites-available/openstack-dashboard.conf b/xenial/debian/apache-sites-available/openstack-dashboard.conf
index 895c565b157354691023152a9de8c6ff2dd64abd..59a64eb615297ef9705cbd03d2385a8d78d18dc3 100644 (file)
--- a/xenial/debian/apache-sites-available/openstack-dashboard.conf
+++ b/xenial/debian/apache-sites-available/openstack-dashboard.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerAdmin webmaster@localhost
     WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess horizon user=www-data group=www-data
+    WSGIDaemonProcess horizon user=horizon group=horizon
     #WSGIProcessGroup openstack-dashboard
     Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
 

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index e953601bdf7026cf597d08dbf556500803e23973..7096efdc4604715b91ce363bd4f02cf35a7e50c7 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -10,7 +10,8 @@ horizon (2014.1~b2-1) experimental; urgency=low
     a warning an harmless warning for the user.
   * avoid openstack-dashboard-apache.postinst failure if the default vhost
     has been removed.
-  * adjust the secret-key group to www-data
+  * adjust the secret-key group to horizon
+  * run horizon with the horizon user/group
 
   [ Thomas Goirand ]
   * New upstream release (Icehouse beta 1).

diff --git a/xenial/debian/openstack-dashboard.postinst b/xenial/debian/openstack-dashboard.postinst
index 895f46eff23ee7b8543752eacf55e7cda816c39d..ae2a6e7e712acd6359e120895ce2262e87e8e103 100644 (file)
--- a/xenial/debian/openstack-dashboard.postinst
+++ b/xenial/debian/openstack-dashboard.postinst
@@ -18,7 +18,9 @@ if [ "$1" = "configure" ] ; then
 
     # Compress the JS and CSS with python-compressor and python-lesscpy
        /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#