Merge pull request voxpupuli#891 from wyardley/issues_742

try to improve spacing in generated configs (Issue voxpupuli#742)

templates/conf.d/nginx.conf.erb

@@ -11,8 +11,8 @@ worker_rlimit_nofile <%= @worker_rlimit_nofile %>;
 pid        <%= @pid %>;
 <% end -%>
 error_log  <%= @nginx_error_log %> <%= @nginx_error_log_severity %>;
-
 <% if @nginx_cfg_prepend -%>
+
 <%- field_width = @nginx_cfg_prepend.inject(0) { |l,(k,v)| k.size > l ? k.size : l } -%>
 <%- @nginx_cfg_prepend.sort_by{|k,v| k}.each do |key,value| -%>
 <%- Array(value).each do |asubvalue| -%>
@@ -60,7 +60,6 @@ http {
   tcp_nopush on;
   <%- end -%>
 <% end -%>
-
   server_tokens <%= @server_tokens %>;
 
   types_hash_max_size <%= @types_hash_max_size %>;

templates/vhost/vhost_header.erb

@@ -151,7 +151,6 @@ server {
 
   access_log            <%= @access_log_real %>;
   error_log             <%= @error_log_real %>;
-
 <% if @error_pages -%>
   <%- @error_pages.keys.sort.each do |key| -%>
   error_page  <%= key %> <%= @error_pages[key] %>;

templates/vhost/vhost_ssl_footer.erb

@@ -1,4 +1,4 @@
-<% if @include_files %>
+<% if @include_files -%>
   <%- @include_files.each do |file| -%>
   include <%= file %>;
   <%- end -%>

templates/vhost/vhost_ssl_header.erb

@@ -83,15 +83,13 @@ server {
 
   access_log            <%= @ssl_access_log_real %>;
   error_log             <%= @ssl_error_log_real %>;
-
 <% if @error_pages -%>
   <%- @error_pages.keys.sort.each do |key| -%>
   error_page  <%= key %> <%= @error_pages[key] %>;
   <%- end -%>
 <% end -%>
-
-
 <% if @vhost_cfg_prepend -%>
+
   <%- @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
       <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
@@ -107,6 +105,7 @@ server {
   <%- end -%>
 <% end -%>
 <% if @vhost_cfg_ssl_prepend -%>
+
   <%- @vhost_cfg_ssl_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
       <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>