openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Anthony Young 2011-09-26 23:42:46 -07:00
parent f446f5154f
commit 124b0c253d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/000-default.template
View File

@ -1,6 +1,8 @@
<VirtualHost *:80> <VirtualHost *:80>
WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi 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 WSGIProcessGroup dashboard
DocumentRoot %DASH_DIR%/.blackhole/ DocumentRoot %DASH_DIR%/.blackhole/

5
stack.sh
View File

@ -249,11 +249,6 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then
## Configure apache's 000-default to run dashboard ## Configure apache's 000-default to run dashboard
sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default 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 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 fi