Merge pull request voxpupuli#249 from fadenb/bug/duplicate_listen_opt…

…ion_ipv6only

Bugfix for duplicate listen option caused by hardcoded `ipv6only=on` in template

manifests/resource/mailhost.pp

@@ -49,7 +49,7 @@
   $ipv6_enable         = false,
   $ipv6_listen_ip      = '::',
   $ipv6_listen_port    = '80',
-  $ipv6_listen_options = 'default',
+  $ipv6_listen_options = 'default ipv6only=on',
   $ssl                 = false,
   $ssl_cert            = undef,
   $ssl_key             = undef,
@@ -64,7 +64,7 @@
     group => 'root',
     mode  => '0644',
   }
-  
+
   if !is_integer($listen_port) {
     fail('$listen_port must be an integer.')
   }

manifests/resource/vhost.pp

@@ -45,7 +45,7 @@
 #     for SSL Support. This is not generated by this module.
 #   [*ssl_dhparam*]         - This directive specifies a file containing
 #     Diffie-Hellman key agreement protocol cryptographic parameters, in PEM
-#     format, utilized for exchanging session keys between server and client. 
+#     format, utilized for exchanging session keys between server and client.
 #   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL
 #     Support. This is not generated by this module.
 #   [*ssl_port*]            - Default IP Port for NGINX to listen with this SSL
@@ -124,7 +124,7 @@
   $ipv6_enable            = false,
   $ipv6_listen_ip         = '::',
   $ipv6_listen_port       = '80',
-  $ipv6_listen_options    = 'default',
+  $ipv6_listen_options    = 'default ipv6only=on',
   $add_header             = undef,
   $ssl                    = false,
   $ssl_cert               = undef,

spec/defines/resource_mailhost_spec.rb

@@ -85,7 +85,7 @@
           :title => 'should set the IPv6 listen options',
           :attr  => 'ipv6_listen_options',
           :value => 'spdy',
-          :match => '  listen [::]:80 spdy ipv6only=on;',
+          :match => '  listen [::]:80 spdy;',
         },
         {
           :title => 'should set servername(s)',
@@ -241,7 +241,7 @@
           :title => 'should set the IPv6 listen options',
           :attr  => 'ipv6_listen_options',
           :value => 'spdy',
-          :match => '  listen [::]:80 spdy ipv6only=on;',
+          :match => '  listen [::]:80 spdy;',
         },
         {
           :title => 'should set servername(s)',

spec/defines/resource_vhost_spec.rb

@@ -95,7 +95,7 @@
           :title => 'should set the IPv6 listen options',
           :attr  => 'ipv6_listen_options',
           :value => 'spdy',
-          :match => '  listen [::]:80 spdy ipv6only=on;',
+          :match => '  listen [::]:80 spdy;',
         },
         {
           :title => 'should set servername(s)',
@@ -321,7 +321,7 @@
           :title => 'should set the IPv6 listen options',
           :attr  => 'ipv6_listen_options',
           :value => 'spdy default',
-          :match => '  listen [::]:443 ssl spdy default ipv6only=on;',
+          :match => '  listen [::]:443 ssl spdy default;',
         },
         {
           :title => 'should set servername(s)',

templates/mailhost/mailhost.erb

@@ -3,7 +3,7 @@ server {
   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 %>;
   <% end %>
   server_name           <%= @server_name.join(" ") %>;
   protocol              <%= @protocol %>;

templates/mailhost/mailhost_ssl.erb

@@ -3,7 +3,7 @@ server {
   listen       <%= @ssl_port %>;
   <% # 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 %>;
   <% end %>
   server_name           <%= @server_name.join(" ") %>;
   protocol              <%= @protocol %>;

templates/vhost/vhost_header.erb

@@ -2,7 +2,7 @@ server {
   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 %>;
 <% end %>
   server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
 <% if defined? @auth_basic -%>

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 %>;
   <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %> ipv6only=on;
+  listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
   <% end %>
   server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;