Skip to content

Commit

Permalink
Merge pull request #744 from gerases/master
Browse files Browse the repository at this point in the history
Remove extra white space
  • Loading branch information
jfryman committed Jan 20, 2016
2 parents c2571e5 + 8304362 commit d05723c
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion templates/vhost/location_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<%- end -%>
<% end -%>
<%- unless @rewrite_rules.nil? || @rewrite_rules.empty? -%>

<%- @rewrite_rules.each do |rewrite_rule| -%>
rewrite <%= rewrite_rule %>;
<%- end -%>
Expand Down
2 changes: 0 additions & 2 deletions templates/vhost/locations/proxy.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>;
Expand Down
2 changes: 0 additions & 2 deletions templates/vhost/vhost_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
Expand All @@ -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 %>;
Expand Down
5 changes: 0 additions & 5 deletions templates/vhost/vhost_ssl_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
Expand All @@ -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 -%>
Expand All @@ -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 %>;
Expand Down
1 change: 0 additions & 1 deletion templates/vhost/vhost_ssl_settings.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@
<%- if defined? @ssl_trusted_cert -%>
ssl_trusted_certificate <%= @ssl_trusted_cert %>;
<%- end -%>

<% end -%>

0 comments on commit d05723c

Please sign in to comment.