From 8f3e28cec1f81b1aa21066155cca3ce8193e9a41 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Tue, 27 Sep 2011 18:26:27 -0700 Subject: [PATCH] use the current user instead of stack for dash --- files/000-default.template | 6 +++--- stack.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/files/000-default.template b/files/000-default.template index cb4585b115..4e4b5c4f8b 100644 --- a/files/000-default.template +++ b/files/000-default.template @@ -1,8 +1,8 @@ WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi - WSGIDaemonProcess dashboard user=stack group=stack processes=3 threads=10 - SetEnv APACHE_RUN_USER stack - SetEnv APACHE_RUN_GROUP stack + WSGIDaemonProcess dashboard user=%USER% group=%USER% processes=3 threads=10 + SetEnv APACHE_RUN_USER %USER% + SetEnv APACHE_RUN_GROUP %USER% WSGIProcessGroup dashboard DocumentRoot %DASH_DIR%/.blackhole/ diff --git a/stack.sh b/stack.sh index 7ecbc83676..4c16bfa500 100755 --- a/stack.sh +++ b/stack.sh @@ -241,6 +241,7 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then ## Configure apache's 000-default to run dashboard sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default + sudo sed -e "s,%USER%,$USER,g" -i /etc/apache2/sites-enabled/000-default sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default fi