Browse code

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

Jenkins authored on 2013/09/18 23:57:28
Showing 1 changed files
... ...
@@ -138,6 +138,7 @@ function _config_swift_apache_wsgi() {
138 138
         s/%PORT%/$proxy_port/g;
139 139
         s/%SERVICENAME%/proxy-server/g;
140 140
         s/%APACHE_NAME%/${APACHE_NAME}/g;
141
+        s/%USER%/${STACK_USER}/g;
141 142
     " -i ${apache_vhost_dir}/proxy-server
142 143
 
143 144
     sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
... ...
@@ -158,6 +159,7 @@ function _config_swift_apache_wsgi() {
158 158
             s/%PORT%/$object_port/g;
159 159
             s/%SERVICENAME%/object-server-${node_number}/g;
160 160
             s/%APACHE_NAME%/${APACHE_NAME}/g;
161
+            s/%USER%/${STACK_USER}/g;
161 162
         " -i ${apache_vhost_dir}/object-server-${node_number}
162 163
         ! is_fedora && sudo a2ensite object-server-${node_number}
163 164
 
... ...
@@ -173,6 +175,7 @@ function _config_swift_apache_wsgi() {
173 173
             s/%PORT%/$container_port/g;
174 174
             s/%SERVICENAME%/container-server-${node_number}/g;
175 175
             s/%APACHE_NAME%/${APACHE_NAME}/g;
176
+            s/%USER%/${STACK_USER}/g;
176 177
         " -i ${apache_vhost_dir}/container-server-${node_number}
177 178
         ! is_fedora && sudo a2ensite container-server-${node_number}
178 179
 
... ...
@@ -188,6 +191,7 @@ function _config_swift_apache_wsgi() {
188 188
             s/%PORT%/$account_port/g;
189 189
             s/%SERVICENAME%/account-server-${node_number}/g;
190 190
             s/%APACHE_NAME%/${APACHE_NAME}/g;
191
+            s/%USER%/${STACK_USER}/g;
191 192
         " -i ${apache_vhost_dir}/account-server-${node_number}
192 193
         ! is_fedora && sudo a2ensite account-server-${node_number}
193 194