From 5e7faed43cf72e2546334da432fcd90e0d558502 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 9 Apr 2013 13:58:15 -0400
Subject: update deprecated haproxy configuration options, set values a little
 lower

---
 puppet/modules/site_haproxy/manifests/init.pp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_haproxy')

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'
     }
   }
 
-- 
cgit v1.2.3