Reorganise whitespace in the vhost header and location header/footer.

The current template inserts newlines after a location, which doesn't seem logical; one can't assume there will always be more blocks that follow. Therefore it is only logical to include the newline before a new location block is inserted, which lends itself to the convention of only prepending newlines to blocks, never appending them.
voxpupuli · Nov 12, 2014 · 123b14e · 123b14e
1 parent 2917a35
commit 123b14e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/templates/vhost/location_footer.erb b/templates/vhost/location_footer.erb
@@ -39,4 +39,3 @@
   <%- end -%>
 <% end -%>
   }
-
diff --git a/templates/vhost/location_header.erb b/templates/vhost/location_header.erb
@@ -1,3 +1,4 @@
+
   location <%= @location %> {
 <% if @internal -%>
     internal;
@@ -52,4 +53,4 @@
     <%- Array(@raw_prepend).each do |line| -%>
     <%= line %>
     <%- end -%>
-<% end -%>
+<% end -%>
diff --git a/templates/vhost/vhost_header.erb b/templates/vhost/vhost_header.erb
@@ -94,4 +94,3 @@ server {
 
   access_log            <%= @access_log_real %>;
   error_log             <%= @error_log_real %>;
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,4 +94,3 @@ server {

		access_log <%= @access_log_real %>;
		error_log <%= @error_log_real %>;