From fbc2916e02cc76886ea1b93fc7f598a6cec9a0c0 Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Thu, 7 Aug 2014 18:03:16 -0400 Subject: [PATCH] Removed extra whitespace Fixed missing -%> --- templates/vhost.conf.erb | 4 ++-- templates/vhost/_proxy.erb | 6 +++--- templates/vhost/_rewrite.erb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb index 64024cfef..95ad3ce7d 100644 --- a/templates/vhost.conf.erb +++ b/templates/vhost.conf.erb @@ -27,9 +27,9 @@ <%= scope.function_template(['apache/vhost/_directories.erb']) -%> ## Load additional static includes -<% Array(@additional_includes).each do |include| %> +<% Array(@additional_includes).each do |include| -%> Include "<%= include %>" -<% end %> +<% end -%> ## Logging <% if @error_log -%> diff --git a/templates/vhost/_proxy.erb b/templates/vhost/_proxy.erb index a1d2e5292..2c6972a80 100644 --- a/templates/vhost/_proxy.erb +++ b/templates/vhost/_proxy.erb @@ -3,7 +3,7 @@ ## Proxy rules ProxyRequests Off <%- end -%> -<% if @proxy_preserve_host %> +<% if @proxy_preserve_host -%> ProxyPreserveHost On <%- end -%> <%- [@proxy_pass].flatten.compact.each do |proxy| -%> @@ -11,11 +11,11 @@ > ProxyPassReverse <%= proxy['url'] %> -<% end %> +<% end -%> <% if @proxy_dest -%> <%- Array(@no_proxy_uris).each do |uri| -%> ProxyPass <%= uri %> ! -<% end %> +<% end -%> ProxyPass / <%= @proxy_dest %>/ ProxyPassReverse <%= @proxy_dest %>/ diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb index af8b45001..c995868d7 100644 --- a/templates/vhost/_rewrite.erb +++ b/templates/vhost/_rewrite.erb @@ -27,7 +27,7 @@ <%- end -%> <%- end -%> <%- end -%> -<%# reverse compatibility %> +<%# reverse compatibility -%> <% if @rewrite_rule and !@rewrites -%> ## Rewrite rules RewriteEngine On