summaryrefslogtreecommitdiff
path: root/puppet/modules/site_haproxy/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-09 13:58:15 -0400
committerMicah Anderson <micah@riseup.net>2013-04-09 13:58:15 -0400
commit5e7faed43cf72e2546334da432fcd90e0d558502 (patch)
treeb656a97f1d8b65cfafc6391ae8f1aa85cad9cce2 /puppet/modules/site_haproxy/manifests
parentdc6cd0ecd31a03e5093cdd9bb6dd1cad576199a2 (diff)
update deprecated haproxy configuration options, set values a little lower
Diffstat (limited to 'puppet/modules/site_haproxy/manifests')
-rw-r--r--puppet/modules/site_haproxy/manifests/init.pp12
1 files changed, 6 insertions, 6 deletions
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 7cb10ab2..602e26be 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -13,12 +13,12 @@ class site_haproxy {
'daemon' => ''
},
defaults_options => {
- 'log' => 'global',
- 'retries' => '3',
- 'option' => 'redispatch',
- 'contimeout' => '5000',
- 'clitimeout' => '50000',
- 'srvtimeout' => '50000'
+ 'log' => 'global',
+ 'retries' => '3',
+ 'option' => 'redispatch',
+ 'timeout connect' => '4000',
+ 'timeout client' => '20000',
+ 'timeout server' => '20000'
}
}