From 89742d66e0b6f9e2ac4077293f5343536c2a2940 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Wed, 5 Mar 2014 21:53:36 +0100 Subject: [PATCH] use horizon user to run the WSGI process (cherry picked from commit fc690ff9570abbd2409c4520a8ad4b44e43d244f) Rewritten-From: 6427db82d3114b43f7cb7e2b93e4c0ede3449ec6 --- trusty/debian/apache-sites-available/openstack-dashboard.conf | 2 +- trusty/debian/changelog | 3 ++- trusty/debian/openstack-dashboard.postinst | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/trusty/debian/apache-sites-available/openstack-dashboard.conf b/trusty/debian/apache-sites-available/openstack-dashboard.conf index 895c565..59a64eb 100644 --- a/trusty/debian/apache-sites-available/openstack-dashboard.conf +++ b/trusty/debian/apache-sites-available/openstack-dashboard.conf @@ -1,7 +1,7 @@ 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/trusty/debian/changelog b/trusty/debian/changelog index e953601..7096efd 100644 --- a/trusty/debian/changelog +++ b/trusty/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/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst index 895f46e..ae2a6e7 100644 --- a/trusty/debian/openstack-dashboard.postinst +++ b/trusty/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# -- 2.45.2