From 124b0c253dbc630862d2dbecadd75de394ef39f0 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Mon, 26 Sep 2011 23:42:46 -0700 Subject: [PATCH] fix apache config to suck less - don't require chown www-data --- files/000-default.template | 4 +++- stack.sh | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/files/000-default.template b/files/000-default.template index 64251f0..cb4585b 100644 --- a/files/000-default.template +++ b/files/000-default.template @@ -1,6 +1,8 @@ WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi - WSGIDaemonProcess dashboard user=www-data group=www-data processes=3 threads=10 + WSGIDaemonProcess dashboard user=stack group=stack processes=3 threads=10 + SetEnv APACHE_RUN_USER stack + SetEnv APACHE_RUN_GROUP stack WSGIProcessGroup dashboard DocumentRoot %DASH_DIR%/.blackhole/ diff --git a/stack.sh b/stack.sh index 4bdd2b7..ba32424 100755 --- a/stack.sh +++ b/stack.sh @@ -249,11 +249,6 @@ 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,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default - - # ``python setup.py develop`` left some files owned by root in ``DASH_DIR`` - # and others are owned by the user you are using to run this script. - # We need to change the owner to apache for dashboard to run. - sudo chown -R www-data:www-data $DASH_DIR fi