Merge pull request #1975 from gcoxmoz/proxytimeout

Change mod_proxy's ProxyTimeout to follow Apache's global timeout

Author: sheenaajay

manifests/mod/proxy.pp

@@ -27,9 +27,10 @@
   $apache_version = undef,
   $package_name   = undef,
   $proxy_via      = 'On',
-  $proxy_timeout  = '60',
+  $proxy_timeout  = undef,
 ) {
   include ::apache
+  $_proxy_timeout = $apache::timeout
   $_apache_version = pick($apache_version, $apache::apache_version)
   ::apache::mod { 'proxy':
     package => $package_name,

templates/mod/proxy.conf.erb

@@ -25,5 +25,7 @@
   # Set to one of: Off | On | Full | Block
   ProxyVia <%= @proxy_via %>
 
+  <%- if @proxy_timeout -%>
   ProxyTimeout <%= @proxy_timeout %>
+  <%- end -%>
 </IfModule>