commit d582460147404587fbcd3a39f350109d1a04a74f
author Jamie Lennox <jlennox@redhat.com> Tue Sep 17 11:44:37 2013 +1000
committer Jamie Lennox <jlennox@redhat.com> Tue Sep 17 11:45:32 2013 +1000
tree 760b078b72d8355e4102cc26d80c54ecb9d44c43
parent 0b29d86930fb9ba00dbb8e593b0a9fcee3559810

Allow replacing a user variable in a swift template

Prepare for a change in swift templates that will have a %USER%
variable.

Change-Id: I611ae7f82de7f2e6a38ce3de38d0600fa8687bff
Partial-Bug: 1226346

lib/swift

diff --git a/lib/swift b/lib/swift
index f72beaf..ae8ef74 100644
--- a/lib/swift
+++ b/lib/swift
@@ -132,6 +132,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
@@ -152,6 +153,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}
 
@@ -167,6 +169,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}
 
@@ -182,6 +185,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}