commit 9bb84f0a706ddf18a550c75ecaf18e25a087a273
author Dean Troyer <dtroyer@gmail.com> Tue Jan 24 11:45:52 2012 -0600
committer Dean Troyer <dtroyer@gmail.com> Tue Jan 24 12:06:21 2012 -0600
tree fb67d41dd4bf32bd1a9a3a487d331a1244b5dc2e
parent 965716e16841b28e34ef296ab861d9e31e9d0cdf

Allow configuration of Apache user and group

* Fixes bug 915064
* APACHE_USER defaults to $USER
* APACHE_GROUP defaults to $APACHE_USER

Change-Id: I06cf39cfd884d8f858ab98b84b3f40c3f6ff3a40

stack.sh

diff --git a/stack.sh b/stack.sh
index 307be94..a35cbba 100755
--- a/stack.sh
+++ b/stack.sh
@@ -410,6 +410,14 @@
 KEYSTONE_SERVICE_PORT=${KEYSTONE_SERVICE_PORT:-5000}
 KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-http}
 
+# Horizon
+# -------
+
+# Allow overriding the default Apache user and group, default both to
+# current user.
+APACHE_USER=${APACHE_USER:-$USER}
+APACHE_GROUP=${APACHE_GROUP:-$APACHE_USER}
+
 # Log files
 # ---------
 
@@ -762,8 +770,11 @@
 
     ## Configure apache's 000-default to run horizon
     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,%HORIZON_DIR%,$HORIZON_DIR,g" -i /etc/apache2/sites-enabled/000-default
+    sudo sed -e "
+        s,%USER%,$APACHE_USER,g;
+        s,%GROUP%,$APACHE_GROUP,g;
+        s,%HORIZON_DIR%,$HORIZON_DIR,g;
+    " -i /etc/apache2/sites-enabled/000-default
     sudo service apache2 restart
 fi