From 7c7ca311ff00c5cddaee892c173354a69f4e59e4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 19 Mar 2013 16:07:00 -0400 Subject: add some generic haproxy defaults --- puppet/modules/site_haproxy/manifests/init.pp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 puppet/modules/site_haproxy/manifests/init.pp (limited to 'puppet/modules/site_haproxy/manifests/init.pp') diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp new file mode 100644 index 00000000..7cb10ab2 --- /dev/null +++ b/puppet/modules/site_haproxy/manifests/init.pp @@ -0,0 +1,25 @@ +class site_haproxy { + + class { 'haproxy': + enable => true, + manage_service => true, + global_options => { + 'log' => '127.0.0.1 local0', + 'maxconn' => '4096', + 'stats' => 'socket /var/run/haproxy.sock user haproxy group haproxy', + 'chroot' => '/usr/share/haproxy', + 'user' => 'haproxy', + 'group' => 'haproxy', + 'daemon' => '' + }, + defaults_options => { + 'log' => 'global', + 'retries' => '3', + 'option' => 'redispatch', + 'contimeout' => '5000', + 'clitimeout' => '50000', + 'srvtimeout' => '50000' + } + } + +} -- cgit v1.2.3 From 5e7faed43cf72e2546334da432fcd90e0d558502 Mon Sep 17 00:00:00 2001 From: Micah Anderson 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/manifests/init.pp') 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 From 9a6026af4f781d081274eb2884e0662dfdd54a07 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 16 Apr 2013 12:26:24 -0400 Subject: pass version to haproxy so that the leap package will be installed this package is a newer version than the one in debian, and as of this writing haproxy is scheduled to be removed from wheezy, also it has hardened flags enabled --- puppet/modules/site_haproxy/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/site_haproxy/manifests/init.pp') diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp index 602e26be..ace88a7b 100644 --- a/puppet/modules/site_haproxy/manifests/init.pp +++ b/puppet/modules/site_haproxy/manifests/init.pp @@ -2,6 +2,7 @@ class site_haproxy { class { 'haproxy': enable => true, + version => '1.4.23-0.1~leap60+1', manage_service => true, global_options => { 'log' => '127.0.0.1 local0', -- cgit v1.2.3