Browse code

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

Jamie Lennox authored on 2013/09/17 10:44:37
Showing 1 changed files
... ...
@@ -132,6 +132,7 @@ function _config_swift_apache_wsgi() {
132 132
         s/%PORT%/$proxy_port/g;
133 133
         s/%SERVICENAME%/proxy-server/g;
134 134
         s/%APACHE_NAME%/${APACHE_NAME}/g;
135
+        s/%USER%/${STACK_USER}/g;
135 136
     " -i ${apache_vhost_dir}/proxy-server
136 137
 
137 138
     sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
... ...
@@ -152,6 +153,7 @@ function _config_swift_apache_wsgi() {
152 152
             s/%PORT%/$object_port/g;
153 153
             s/%SERVICENAME%/object-server-${node_number}/g;
154 154
             s/%APACHE_NAME%/${APACHE_NAME}/g;
155
+            s/%USER%/${STACK_USER}/g;
155 156
         " -i ${apache_vhost_dir}/object-server-${node_number}
156 157
         ! is_fedora && sudo a2ensite object-server-${node_number}
157 158
 
... ...
@@ -167,6 +169,7 @@ function _config_swift_apache_wsgi() {
167 167
             s/%PORT%/$container_port/g;
168 168
             s/%SERVICENAME%/container-server-${node_number}/g;
169 169
             s/%APACHE_NAME%/${APACHE_NAME}/g;
170
+            s/%USER%/${STACK_USER}/g;
170 171
         " -i ${apache_vhost_dir}/container-server-${node_number}
171 172
         ! is_fedora && sudo a2ensite container-server-${node_number}
172 173
 
... ...
@@ -182,6 +185,7 @@ function _config_swift_apache_wsgi() {
182 182
             s/%PORT%/$account_port/g;
183 183
             s/%SERVICENAME%/account-server-${node_number}/g;
184 184
             s/%APACHE_NAME%/${APACHE_NAME}/g;
185
+            s/%USER%/${STACK_USER}/g;
185 186
         " -i ${apache_vhost_dir}/account-server-${node_number}
186 187
         ! is_fedora && sudo a2ensite account-server-${node_number}
187 188