openstack/puppet-swift
Code Issues Proposed changes

Remove extra newlines from swift proxy erb

Browse Source
This commit is contained in:
Dan Bode
2012-02-26 20:53:10 -08:00
parent 4775be3a5f
commit b569cf6f0f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/proxy-server.conf.erb
View File

@@ -16,20 +16,20 @@ use = egg:swift#proxy
allow_account_management = <%= allow_account_management %> allow_account_management = <%= allow_account_management %>
account_autocreate = <%= account_autocreate %> account_autocreate = <%= account_autocreate %>
<% if auth_type == 'swauth' %> <% if auth_type == 'swauth' -%>
[filter:swauth] [filter:swauth]
use = egg:swauth#swauth use = egg:swauth#swauth
# this line is not in the install docs? # this line is not in the install docs?
default_swift_cluster = local#<%= swauth_endpoint %> default_swift_cluster = local#<%= swauth_endpoint %>
super_admin_key = <%= swauth_super_admin_key %> super_admin_key = <%= swauth_super_admin_key %>
<% elsif auth_type == 'tempauth' %> <% elsif auth_type == 'tempauth' -%>
[filter:tempauth] [filter:tempauth]
use = egg:swift#tempauth use = egg:swift#tempauth
user_admin_admin = admin .admin .reseller_admin user_admin_admin = admin .admin .reseller_admin
user_test_tester = testing .admin user_test_tester = testing .admin
user_test2_tester2 = testing2 .admin user_test2_tester2 = testing2 .admin
user_test_tester3 = testing3 user_test_tester3 = testing3
<% end %> <% end -%>
[filter:healthcheck] [filter:healthcheck]
use = egg:swift#healthcheck use = egg:swift#healthcheck