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

files/000-default.template

@@ -1,8 +1,8 @@
 <VirtualHost *:80>
     WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess dashboard user=stack group=stack processes=3 threads=10
-    SetEnv APACHE_RUN_USER stack
-    SetEnv APACHE_RUN_GROUP stack
+    WSGIDaemonProcess dashboard user=%USER% group=%USER% processes=3 threads=10
+    SetEnv APACHE_RUN_USER %USER%
+    SetEnv APACHE_RUN_GROUP %USER%
     WSGIProcessGroup dashboard
 
     DocumentRoot %DASH_DIR%/.blackhole/

stack.sh

@@ -241,6 +241,7 @@ 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,%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
 fi