Merge pull request voxpupuli#744 from gerases/master

Remove extra white space
slm0n87 · Jan 20, 2016 · 04939e1 · 04939e1
2 parents 230fc04 + 1e850f1
commit 04939e1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 11 deletions.
diff --git a/templates/vhost/location_header.erb b/templates/vhost/location_header.erb
@@ -61,7 +61,6 @@
     <%- end -%>
 <% end -%>
 <%- unless @rewrite_rules.nil? || @rewrite_rules.empty? -%>
-
     <%- @rewrite_rules.each do |rewrite_rule| -%>
     rewrite <%= rewrite_rule %>;
     <%- end -%>

diff --git a/templates/vhost/locations/proxy.erb b/templates/vhost/locations/proxy.erb
@@ -9,11 +9,9 @@
     proxy_set_body        <%= @proxy_set_body %>;
 <% end -%>
 <% unless @proxy_set_header.nil? -%>
-
     <%- @proxy_set_header.each do |header| -%>
     proxy_set_header      <%= header %>;
     <%- end -%>
-
 <% end -%>
 <% if @proxy_cache -%>
     proxy_cache           <%= @proxy_cache %>;

diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -70,7 +70,6 @@ server {
   <%- end -%>
 <% end -%>
 <% if instance_variables.any? { |iv| iv.to_s.include? 'client_' } -%>
-
   <%- if defined? @client_body_timeout -%>
   client_body_timeout <%= @client_body_timeout %>;
   <%- end -%>
@@ -80,7 +79,6 @@ server {
   <%- if defined? @client_max_body_size -%>
   client_max_body_size <%= @client_max_body_size %>;
   <%- end -%>
-
 <% end -%>
 <% if defined? @gzip_types -%>
   gzip_types <%= @gzip_types %>;

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -48,12 +48,9 @@ server {
   server_name  <%= @rewrite_www_to_non_www ? @server_name.join("  ").gsub(/(^| )(www\.)?(?=[a-z0-9])/, '') : @server_name.join(" ") %>;
 
 <%= scope.function_template(["nginx/vhost/vhost_ssl_settings.erb"]) %>
-
 <% if @maintenance -%>
   <%= @maintenance_value %>;
 <% end -%>
-
-
 <% if Array(@resolver).count > 0 -%>
   resolver                  <% Array(@resolver).each do |r| %> <%= r %><% end %>;
 <% end -%>
@@ -66,7 +63,6 @@ server {
   <% end -%>
 <%- end -%>
 <%- if instance_variables.any? { |iv| iv.to_s.include? 'client_' } -%>
-
   <%- if defined? @client_body_timeout -%>
   client_body_timeout <%= @client_body_timeout %>;
   <%- end -%>
@@ -76,7 +72,6 @@ server {
   <%- if defined? @client_max_body_size -%>
   client_max_body_size <%= @client_max_body_size %>;
   <%- end -%>
-
 <% end -%>
 <% if defined? @gzip_types -%>
   gzip_types <%= @gzip_types %>;

diff --git a/templates/vhost/vhost_ssl_settings.erb b/templates/vhost/vhost_ssl_settings.erb
@@ -36,5 +36,4 @@
   <%- if defined? @ssl_trusted_cert -%>
   ssl_trusted_certificate   <%= @ssl_trusted_cert %>;
   <%- end -%>
-
 <% end -%>