josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into nova-vncproxy-redux

Browse source
This commit is contained in:
Anthony Young 2011-09-27 18:58:36 -07:00
commit 0383b4a29e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/000-default.template
View file

@ -1,8 +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=stack group=stack processes=3 threads=10 WSGIDaemonProcess dashboard user=%USER% group=%USER% processes=3 threads=10
SetEnv APACHE_RUN_USER stack SetEnv APACHE_RUN_USER %USER%
SetEnv APACHE_RUN_GROUP stack SetEnv APACHE_RUN_GROUP %USER%
WSGIProcessGroup dashboard WSGIProcessGroup dashboard
DocumentRoot %DASH_DIR%/.blackhole/ DocumentRoot %DASH_DIR%/.blackhole/

1
stack.sh
View file

@ -241,6 +241,7 @@ 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,%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 sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default
fi fi