commit 9c3b0cc4e4aeda9d889c90177f34e45a0505d176
author Jenkins <jenkins@review.openstack.org> Wed Sep 18 14:57:28 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 18 14:57:28 2013 +0000
tree cb8353a835a39312a7c65ccb89e4b737c0569d14
parent 3418c1caa5c52fd9989e5829fda0848b4a8dfea7
parent d582460147404587fbcd3a39f350109d1a04a74f

Merge "Allow replacing a user variable in a swift template"

lib/swift

diff --git a/lib/swift b/lib/swift
index 3dcd8b6..25d443d 100644
--- a/lib/swift
+++ b/lib/swift
@@ -138,6 +138,7 @@
         s/%PORT%/$proxy_port/g;
         s/%SERVICENAME%/proxy-server/g;
         s/%APACHE_NAME%/${APACHE_NAME}/g;
+        s/%USER%/${STACK_USER}/g;
     " -i ${apache_vhost_dir}/proxy-server
 
     sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
@@ -158,6 +159,7 @@
             s/%PORT%/$object_port/g;
             s/%SERVICENAME%/object-server-${node_number}/g;
             s/%APACHE_NAME%/${APACHE_NAME}/g;
+            s/%USER%/${STACK_USER}/g;
         " -i ${apache_vhost_dir}/object-server-${node_number}
         ! is_fedora && sudo a2ensite object-server-${node_number}
 
@@ -173,6 +175,7 @@
             s/%PORT%/$container_port/g;
             s/%SERVICENAME%/container-server-${node_number}/g;
             s/%APACHE_NAME%/${APACHE_NAME}/g;
+            s/%USER%/${STACK_USER}/g;
         " -i ${apache_vhost_dir}/container-server-${node_number}
         ! is_fedora && sudo a2ensite container-server-${node_number}
 
@@ -188,6 +191,7 @@
             s/%PORT%/$account_port/g;
             s/%SERVICENAME%/account-server-${node_number}/g;
             s/%APACHE_NAME%/${APACHE_NAME}/g;
+            s/%USER%/${STACK_USER}/g;
         " -i ${apache_vhost_dir}/account-server-${node_number}
         ! is_fedora && sudo a2ensite account-server-${node_number}