commit 124b0c253dbc630862d2dbecadd75de394ef39f0
author Anthony Young <sleepsonthefloor@gmail.com> Mon Sep 26 23:42:46 2011 -0700
committer Anthony Young <sleepsonthefloor@gmail.com> Mon Sep 26 23:42:46 2011 -0700
tree aa3b024d4913e249b84e26959cb19812b84de4e4
parent f446f5154f41d45b15c044fc92027d9c4f57a4f6

fix apache config to suck less - don't require chown www-data

files/000-default.template

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 @@
 <VirtualHost *:80>
     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/

stack.sh

diff --git a/stack.sh b/stack.sh
index 4bdd2b7..ba32424 100755
--- a/stack.sh
+++ b/stack.sh
@@ -249,11 +249,6 @@
     ## 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