Merge pull request voxpupuli#171 from thomasbiddle/upstream_fail_timeout

Adding upstream fail_timeout.
cegeka · Jan 28, 2014 · ddeb36d · ddeb36d
2 parents 933ca35 + 44853e4
commit ddeb36d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -5,7 +5,8 @@
 # Parameters:
 #   [*members*]               - Array of member URIs for NGINX to connect to. Must follow valid NGINX syntax.
 #   [*ensure*]                - Enables or disables the specified location (present|absent)
-#   [*upstream_cfg_prepend*] - It expects a hash with custom directives to put before anything else inside upstream
+#   [*upstream_cfg_prepend*]  - It expects a hash with custom directives to put before anything else inside upstream
+#   [*upstream_fail_timeout*] - Set the fail_timeout for the upstream. Default is 10 seconds - As that is what Nginx does normally.
 #
 # Actions:
 #
@@ -40,6 +41,7 @@
   $members,
   $ensure = 'present',
   $upstream_cfg_prepend = undef,
+  $upstream_fail_timeout = '10s',
 ) {
 
   validate_array($members)

diff --git a/templates/conf.d/upstream.erb b/templates/conf.d/upstream.erb
@@ -3,5 +3,5 @@ upstream <%= @name %> {
   <%= key %> <%= value %>;
 <% end -%><% end -%>
   <% @members.each do |i| %>
-  server     <%= i %>;<% end %>
+  server     <%= i %>  fail_timeout=<%= @upstream_fail_timeout %>;<% end %>
 }