debug_connections plural; cleaner default

voxpupuli · Aug 29, 2020 · 32c3a90 · 32c3a90
1 parent 8d3cac2
commit 32c3a90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -57,7 +57,7 @@
   $lingering_timeout              = $nginx::lingering_timeout
   $etag                           = $nginx::etag
   $events_use                     = $nginx::events_use
-  $debug_connection               = $nginx::debug_connection
+  $debug_connections              = $nginx::debug_connections
   $fastcgi_cache_inactive         = $nginx::fastcgi_cache_inactive
   $fastcgi_cache_key              = $nginx::fastcgi_cache_key
   $fastcgi_cache_keys_zone        = $nginx::fastcgi_cache_keys_zone

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -88,7 +88,7 @@
   $lingering_timeout                                         = '5s',
   Optional[Enum['on', 'off']] $etag                          = undef,
   Optional[String] $events_use                               = undef,
-  Optional[Array[Nginx::DebugConnection]] $debug_connection  = undef,
+  Array[Nginx::DebugConnection] $debug_connections           = [],
   String $fastcgi_cache_inactive                             = '20m',
   Optional[String] $fastcgi_cache_key                        = undef,
   String $fastcgi_cache_keys_zone                            = 'd3:100m',

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
@@ -45,10 +45,9 @@ events {
   <%- if @events_use -%>
   use <%= @events_use %>;
   <%- end -%>
-  <% if @debug_connection -%>
-    <%- @debug_connection.each do |address| -%>
+  <%- @debug_connections.each do |address| -%>
   debug_connection <%= address %>;
-    <%- end -%>
+  <%- end -%>
   <% end -%>
 }