fix spacing issues in various templates

Before this change, vhost_ssl_header would merge "ssl" with any listen options, e.g.: listen *:443 ssldefault; when listen_options => 'default'.
gini · Nov 22, 2013 · 4af2087 · 4af2087
1 parent c8d9ad5
commit 4af2087
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 40 deletions.
diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb
@@ -121,34 +121,32 @@
           :value => 'my_location',
           :match => '  location my_location {',
         },
-        # TODO: fix in template so following matches
-        #{
-        #  :title => 'should contain ordered prepended directives',
-        #  :attr  => 'location_cfg_prepend',
-        #  :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-        #  :match => [
-        #    '    allow test value 3;',
-        #    '    test1 test value 1;',
-        #    '    test2 test value 2;',
-        #  ],
-        #},
+        {
+          :title => 'should contain ordered prepended directives',
+          :attr  => 'location_cfg_prepend',
+          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :match => [
+            '    allow test value 3;',
+            '    test1 test value 1;',
+            '    test2 test value 2;',
+          ],
+        },
         {
           :title => 'should set alias',
           :attr  => 'location_alias',
           :value => 'value',
           :match => '    alias      value;',
         },
-        #TODO: fix in template so following matches
-        #{
-        #  :title => 'should contain ordered appended directives',
-        #  :attr  => 'location_cfg_append',
-        #  :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-        #  :match => [
-        #    '    allow test value 3; ',
-        #    '    test1 test value 1; ',
-        #    '    test2 test value 2;  ',
-        #  ],
-        #},
+        {
+          :title => 'should contain ordered appended directives',
+          :attr  => 'location_cfg_append',
+          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
+          :match => [
+            '    allow test value 3;',
+            '    test1 test value 1;',
+            '    test2 test value 2;',
+          ],
+        },
       ].each do |param|
         context "when #{param[:attr]} is #{param[:value]}" do
           let :default_params do { :location => 'location', :location_alias => 'location_alias_value', :vhost => 'vhost1' } end
@@ -247,7 +245,7 @@
           :title => 'should set try_file(s)',
           :attr  => 'try_files',
           :value => ['name1','name2'],
-          :match => '    try_files  name1  name2 ;', #TODO
+          :match => '    try_files name1 name2;',
         },
         {
           :title => 'should set fastcgi_params',
@@ -332,7 +330,7 @@
           :title => 'should set try_file(s)',
           :attr  => 'try_files',
           :value => ['name1','name2'],
-          :match => '    try_files  name1  name2 ;', #TODO
+          :match => '    try_files name1 name2;',
         },
         {
           :title => 'should set index_file(s)',

diff --git a/spec/defines/resource_mailhost_spec.rb b/spec/defines/resource_mailhost_spec.rb
@@ -39,13 +39,13 @@
           :title => 'should set the IPv4 listen IP',
           :attr  => 'listen_ip',
           :value => '127.0.0.1',
-          :match => '  listen                127.0.0.1:25 ;', #TODO
+          :match => '  listen                127.0.0.1:25;',
         },
         {
           :title => 'should set the IPv4 listen port',
           :attr  => 'listen_port',
           :value => '45',
-          :match => '  listen                *:45 ;', #TODO
+          :match => '  listen                *:45;',
         },
         {
           :title => 'should set the IPv4 listen options',
@@ -83,6 +83,12 @@
           :value => 'spdy',
           :match => '  listen [::]:80 spdy ipv6only=on;',
         },
+        {
+          :title => 'should not set the IPv6 listen options',
+          :attr  => 'ipv6_listen_options',
+          :value => false,
+          :match => '  listen [::]:80 ipv6only=on;',
+        },
         {
           :title => 'should set servername(s)',
           :attr  => 'server_name',

diff --git a/spec/defines/resource_upstream_spec.rb b/spec/defines/resource_upstream_spec.rb
@@ -40,9 +40,7 @@
           :match => [
             '  test1 test value 1;',
             '  test2 test value 2;',
-            #TODO: fix this output in the template; should be no trailing
-            #spaces
-            '  test3 test value 3;  ',
+            '  test3 test value 3;',
           ],
         },
         {

diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb
@@ -284,8 +284,13 @@
           :title => 'should set the IPv4 listen options',
           :attr  => 'listen_options',
           :value => 'default',
-#TODO: fix me in template
-          :match => '  listen       *:443 ssldefault;',
+          :match => '  listen       *:443 ssl default;',
+        },
+        {
+          :title => 'should not set the IPv4 listen options',
+          :attr  => 'listen_options',
+          :value => false,
+          :match => '  listen       *:443 ssl;',
         },
 #        {
 #          :title => 'should enable IPv6',

diff --git a/templates/conf.d/upstream.erb b/templates/conf.d/upstream.erb
@@ -1,6 +1,7 @@
 upstream <%= @name %> {
 <% if @upstream_cfg_prepend -%><% upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| %>
-  <%= key %> <%= value %>;<% end -%><% end -%>
+  <%= key %> <%= value %>;
+<% end -%><% end -%>
   <% @members.each do |i| %>
   server     <%= i %>;<% end %>
 }
diff --git a/templates/mailhost/mailhost.erb b/templates/mailhost/mailhost.erb
@@ -1,9 +1,9 @@
 
 server {
-  listen                <%= listen_ip %>:<%= listen_port %> <% if @listen_options %><%= listen_options %><% end %>;
+  listen                <%= listen_ip %>:<%= listen_port %><% if @listen_options %> <%= listen_options %><% end %>;
   <% # check to see if ipv6 support exists in the kernel before applying %>
   <% if ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= ipv6_listen_ip %>]:<%= ipv6_listen_port %> <% if @ipv6_listen_options %><%= ipv6_listen_options %><% end %> ipv6only=on;
+  listen [<%= ipv6_listen_ip %>]:<%= ipv6_listen_port %><% if @ipv6_listen_options %> <%= ipv6_listen_options %><% end %> ipv6only=on;
   <% end %>
   server_name           <%= server_name.join(" ") %>;
   protocol              <%= protocol %>;

diff --git a/templates/vhost/vhost_location_alias.erb b/templates/vhost/vhost_location_alias.erb
@@ -1,8 +1,10 @@
   location <%= @location %> {
 <% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-    <%= key %> <%= value %>;<% end -%><% end -%>
+    <%= key %> <%= value %>;
+<% end -%><% end -%>
     alias      <%= @location_alias %>;
 <% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-    <%= key %> <%= value %>;<% end -%><% end -%>
+    <%= key %> <%= value %>;
+<% end -%><% end -%>
   }
 
diff --git a/templates/vhost/vhost_location_directory.erb b/templates/vhost/vhost_location_directory.erb
@@ -12,7 +12,7 @@
     root  <%= @www_root %>;
 <% end -%>
 <% if @try_files -%>
-    try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>;
+    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
 <% end -%>
 <% if @index_files -%>
     index <% @index_files.each do |i| %> <%= i %><% end %>;

diff --git a/templates/vhost/vhost_location_fastcgi.erb b/templates/vhost/vhost_location_fastcgi.erb
@@ -9,7 +9,7 @@
     fastcgi_split_path_info <%= @fastcgi_split_path %>;
 <% end -%>
 <% if @try_files -%>
-    try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>;
+    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
 <% end -%>
     include <%= @fastcgi_params %>;
     fastcgi_pass <%= @fastcgi %>;

diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb
@@ -1,7 +1,7 @@
 server {
-  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @listen_options %><%= @listen_options %><% end %>;
+  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
   <% if @ipv6_enable == 'true' && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
+  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %> ipv6only=on;
   <% end %>
   server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;