Merge "Trim useless blank lines in generated config file"

Author: Jenkins

spec/classes/swift_proxy_spec.rb

@@ -62,9 +62,7 @@ class { swift: swift_hash_path_suffix => string }"
 #
 [DEFAULT]
 bind_port = 8080
-
 bind_ip = 127.0.0.1
-
 workers = 1
 user = swift
 log_name = proxy-server
@@ -73,8 +71,6 @@ class { swift: swift_hash_path_suffix => string }"
 log_headers = False
 log_address = /dev/log
 
-
-
 [pipeline:main]
 pipeline = healthcheck cache tempauth proxy-server
 
@@ -87,10 +83,6 @@ class { swift: swift_hash_path_suffix => string }"
 log_handoffs = true
 allow_account_management = true
 account_autocreate = true
-
-
-
-
 ')
       end
 
@@ -136,18 +128,14 @@ class { swift: swift_hash_path_suffix => string }
 #
 [DEFAULT]
 bind_port = 80
-
 bind_ip = 10.0.0.2
-
 workers = 3
 user = swift
 log_name = swift-proxy-server
 log_facility = LOG_LOCAL1
 log_level = DEBUG
 log_headers = False
 log_address = /dev/log
-
-
 cors_allow_origin = http://foo.bar:1234,https://foo.bar
 strict_cors_mode = true
 
@@ -223,9 +211,7 @@ class { swift: swift_hash_path_suffix => string }
 #
 [DEFAULT]
 bind_port = 80
-
 bind_ip = 10.0.0.2
-
 workers = 3
 user = swift
 log_name = swift-proxy-server

templates/proxy-server.conf.erb

@@ -2,9 +2,9 @@
 #
 [DEFAULT]
 bind_port = <%= @port %>
-<% if @proxy_local_net_ip %>
+<% if @proxy_local_net_ip -%>
 bind_ip = <%= @proxy_local_net_ip %>
-<% end %>
+<% end -%>
 workers = <%= @workers %>
 user = swift
 log_name = <%= @log_name %>
@@ -14,11 +14,11 @@ log_headers = <%= @log_headers %>
 log_address = <%= @log_address %>
 <% if @log_udp_host -%>
 # If set, log_udp_host will override log_address
-log_udp_host = <%= @log_udp_host -%>
-<% end %>
+log_udp_host = <%= @log_udp_host %>
+<% end -%>
 <% if @log_udp_host and @log_udp_port -%>
-log_udp_port = <%= @log_udp_port -%>
-<% end %>
+log_udp_port = <%= @log_udp_port %>
+<% end -%>
 <% if @cors_allow_origin -%>
 cors_allow_origin = <%= @cors_allow_origin %>
 strict_cors_mode = <%= @strict_cors_mode %>
@@ -45,14 +45,14 @@ allow_account_management = <%= @allow_account_management %>
 account_autocreate = <%= @account_autocreate %>
 <% if @read_affinity -%>
 sorting_method = affinity
-read_affinity = <%= @read_affinity -%>
-<% end %>
+read_affinity = <%= @read_affinity %>
+<% end -%>
 <% if @write_affinity -%>
-write_affinity = <%= @write_affinity -%>
-<% end %>
+write_affinity = <%= @write_affinity %>
+<% end -%>
 <% if @write_affinity_node_count -%>
-write_affinity_node_count = <%= @write_affinity_node_count -%>
-<% end %>
+write_affinity_node_count = <%= @write_affinity_node_count %>
+<% end -%>
 <% if @node_timeout -%>
-node_timeout = <%= @node_timeout -%>
-<% end %>
+node_timeout = <%= @node_timeout %>
+<% end -%>