Browse code

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

Anthony Young authored on 2011/09/27 15:42:46
Showing 2 changed files
... ...
@@ -1,6 +1,8 @@
1 1
 <VirtualHost *:80>
2 2
     WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi
3
-    WSGIDaemonProcess dashboard user=www-data group=www-data processes=3 threads=10
3
+    WSGIDaemonProcess dashboard user=stack group=stack processes=3 threads=10
4
+    SetEnv APACHE_RUN_USER stack
5
+    SetEnv APACHE_RUN_GROUP stack
4 6
     WSGIProcessGroup dashboard
5 7
 
6 8
     DocumentRoot %DASH_DIR%/.blackhole/
... ...
@@ -249,11 +249,6 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then
249 249
     ## Configure apache's 000-default to run dashboard
250 250
     sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default
251 251
     sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default
252
-
253
-    # ``python setup.py develop`` left some files owned by root in ``DASH_DIR``
254
-    # and others are owned by the user you are using to run this script.
255
-    # We need to change the owner to apache for dashboard to run.
256
-    sudo chown -R www-data:www-data $DASH_DIR
257 252
 fi
258 253
 
259 254