openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2013-09-18 14:57:28 +00:00 committed by Gerrit Code Review
commit 9c3b0cc4e4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/swift
View File

@ -138,6 +138,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$proxy_port/g; s/%PORT%/$proxy_port/g;
s/%SERVICENAME%/proxy-server/g; s/%SERVICENAME%/proxy-server/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/proxy-server " -i ${apache_vhost_dir}/proxy-server
sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi 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() {
s/%PORT%/$object_port/g; s/%PORT%/$object_port/g;
s/%SERVICENAME%/object-server-${node_number}/g; s/%SERVICENAME%/object-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/object-server-${node_number} " -i ${apache_vhost_dir}/object-server-${node_number}
! is_fedora && sudo a2ensite object-server-${node_number} ! is_fedora && sudo a2ensite object-server-${node_number}
@ -173,6 +175,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$container_port/g; s/%PORT%/$container_port/g;
s/%SERVICENAME%/container-server-${node_number}/g; s/%SERVICENAME%/container-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/container-server-${node_number} " -i ${apache_vhost_dir}/container-server-${node_number}
! is_fedora && sudo a2ensite container-server-${node_number} ! is_fedora && sudo a2ensite container-server-${node_number}
@ -188,6 +191,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$account_port/g; s/%PORT%/$account_port/g;
s/%SERVICENAME%/account-server-${node_number}/g; s/%SERVICENAME%/account-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/account-server-${node_number} " -i ${apache_vhost_dir}/account-server-${node_number}
! is_fedora && sudo a2ensite account-server-${node_number} ! is_fedora && sudo a2ensite account-server-${node_number}