Merge pull request #1448 from saz/add_reset_timedout_connection

add reset_timedout_connection parameter

Author: bastelfreak

manifests/config.pp

@@ -43,6 +43,7 @@
   $lingering_timeout              = $nginx::lingering_timeout
   $lingering_close                = $nginx::lingering_close
   $lingering_time                 = $nginx::lingering_time
+  $reset_timedout_connection      = $nginx::reset_timedout_connection
   $etag                           = $nginx::etag
   $events_use                     = $nginx::events_use
   $debug_connections              = $nginx::debug_connections

manifests/init.pp

@@ -34,6 +34,10 @@
 # @param service_config_check_command
 #  Command to execute to validate the generated configuration.
 #
+# @param reset_timedout_connection
+#   Enables or disables resetting timed out connections and connections closed
+#   with the non-standard code 444.
+#
 class nginx (
   ### START Nginx Configuration ###
   Variant[Stdlib::Absolutepath, Boolean] $client_body_temp_path = $nginx::params::client_body_temp_path,
@@ -176,6 +180,7 @@
   Optional[Stdlib::Absolutepath] $ssl_trusted_certificate    = undef,
   Optional[Integer] $ssl_verify_depth                        = undef,
   Optional[Stdlib::Absolutepath] $ssl_password_file          = undef,
+  Optional[Enum['on', 'off']] $reset_timedout_connection     = undef,
 
   ### START Package Configuration ###
   $package_ensure                                            = present,

manifests/resource/location.pp

@@ -171,6 +171,9 @@
 #   no longer inherit headers from the parent server context
 # @param gzip_static
 #   Defines gzip_static, nginx default is off
+# @param reset_timedout_connection
+#   Enables or disables resetting timed out connections and connections closed
+#   with the non-standard code 444.
 #
 # @example Simple example
 #   nginx::resource::location { 'test2.local-bob':
@@ -300,6 +303,7 @@
   Optional[String] $expires                                        = undef,
   Hash $add_header                                                 = {},
   Optional[Enum['on', 'off', 'always']] $gzip_static               = undef,
+  Optional[Enum['on', 'off']] $reset_timedout_connection           = undef,
 ) {
   if ! defined(Class['nginx']) {
     fail('You must include the nginx base class before using any defined resources')

manifests/resource/server.pp

@@ -48,6 +48,9 @@
 # @param autoindex_localtime
 #   Specifies whether times in the directory listing should be output in the
 #   local time zone or UTC.
+# @param reset_timedout_connection
+#   Enables or disables resetting timed out connections and connections closed
+#   with the non-standard code 444.
 # @param proxy
 #   Proxy server(s) for the root location to connect to. Accepts a single
 #   value, can be used in conjunction with nginx::resource::upstream
@@ -362,6 +365,7 @@
   Optional[Enum['on', 'off']] $autoindex_exact_size                              = undef,
   Optional[Enum['html', 'xml', 'json', 'jsonp']] $autoindex_format               = undef,
   Optional[Enum['on', 'off']] $autoindex_localtime                               = undef,
+  Optional[Enum['on', 'off']] $reset_timedout_connection                         = undef,
   Array[String] $server_name                                                     = [$name],
   Optional[String] $www_root                                                     = undef,
   Boolean $rewrite_www_to_non_www                                                = false,

spec/classes/nginx_spec.rb

@@ -1102,6 +1102,12 @@
                   '  debug_connection 127.0.0.1;',
                   '  debug_connection unix:;'
                 ]
+              },
+              {
+                title: 'should set reset_timedout_connection',
+                attr: 'reset_timedout_connection',
+                value: 'on',
+                match: %r{^\s+reset_timedout_connection\s+on;}
               }
             ].each do |param|
               context "when #{param[:attr]} is #{param[:value]}" do

spec/defines/resource_location_spec.rb

@@ -230,6 +230,12 @@
               attr: 'auth_request',
               value: 'value',
               match: %r{\s+auth_request\s+value;}
+            },
+            {
+              title: 'should set reset_timedout_connection',
+              attr: 'reset_timedout_connection',
+              value: 'on',
+              match: %r{^\s+reset_timedout_connection\s+on;}
             }
           ].each do |param|
             context "when #{param[:attr]} is #{param[:value]}" do

spec/defines/resource_server_spec.rb

@@ -379,6 +379,12 @@
               attr: 'autoindex_exact_size',
               value: 'on',
               match: '  autoindex_exact_size on;'
+            },
+            {
+              title: 'should set reset_timedout_connection',
+              attr: 'reset_timedout_connection',
+              value: 'on',
+              match: %r{^\s+reset_timedout_connection\s+on;}
             }
           ].each do |param|
             context "when #{param[:attr]} is #{param[:value]}" do

templates/conf.d/nginx.conf.erb

@@ -132,6 +132,9 @@ http {
 <% end -%>
   lingering_timeout   <%= @lingering_timeout %>;
   tcp_nodelay         <%= @http_tcp_nodelay %>;
+<% if @reset_timedout_connection -%>
+  reset_timedout_connection <%= @reset_timedout_connection %>;
+<% end -%>
 
 <% if @etag -%>
   etag <%= @etag %>;

templates/server/location_header.erb

@@ -80,3 +80,6 @@
 <% if @limit_zone -%>
     limit_req zone=<%= @limit_zone %>;
 <% end -%>
+<% if @reset_timedout_connection -%>
+  reset_timedout_connection <%= @reset_timedout_connection %>;
+<% end -%>

templates/server/server_header.erb

@@ -152,6 +152,9 @@ server {
 <% if defined? @autoindex_localtime -%>
   autoindex_localtime <%= @autoindex_localtime %>;
 <% end -%>
+<% if @reset_timedout_connection -%>
+  reset_timedout_connection <%= @reset_timedout_connection %>;
+<% end -%>
 <% if defined? @log_by_lua -%>
   log_by_lua '<%= @log_by_lua %>';
 <% end -%>