diff options
| author | Hunter Haugen <h.haugen@gmail.com> | 2012-08-30 16:32:55 -0700 |
|---|---|---|
| committer | Hunter Haugen <h.haugen@gmail.com> | 2012-10-10 11:56:11 -0700 |
| commit | 602caf1fac96424320b92ea0aa69873acf2bee0c (patch) | |
| tree | 04bd5a2a285d45b320a0e93b403bd72710abbdf1 /manifests | |
| parent | 82cc860495ebb89a08dd02191ec34f5d8b858592 (diff) | |
Update hash formatting for readability
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/data.pp | 82 | ||||
| -rw-r--r-- | manifests/init.pp | 49 |
2 files changed, 76 insertions, 55 deletions
diff --git a/manifests/data.pp b/manifests/data.pp index effa0f8..ab920ed 100644 --- a/manifests/data.pp +++ b/manifests/data.pp @@ -7,40 +7,58 @@ class haproxy::data { case $osfamily { Redhat: { - $haproxy_global_options = { 'log' => "${::ipaddress} local0", - 'chroot' => '/var/lib/haproxy', - 'pidfile' => '/var/run/haproxy.pid', - 'maxconn' => '4000', - 'user' => 'haproxy', - 'group' => 'haproxy', - 'daemon' => '', - 'stats' => 'socket /var/lib/haproxy/stats' - } - $haproxy_defaults_options = { 'log' => 'global', - 'stats' => 'enable', - 'option' => 'redispatch', - 'retries' => '3', - 'timeout' => ['http-request 10s', 'queue 1m', 'connect 10s', 'client 1m', 'server 1m', 'check 10s'], - 'maxconn' => '8000' - } + $haproxy_global_options = { + 'log' => "${::ipaddress} local0", + 'chroot' => '/var/lib/haproxy', + 'pidfile' => '/var/run/haproxy.pid', + 'maxconn' => '4000', + 'user' => 'haproxy', + 'group' => 'haproxy', + 'daemon' => '', + 'stats' => 'socket /var/lib/haproxy/stats' + } + $haproxy_defaults_options = { + 'log' => 'global', + 'stats' => 'enable', + 'option' => 'redispatch', + 'retries' => '3', + 'timeout' => [ + 'http-request 10s', + 'queue 1m', + 'connect 10s', + 'client 1m', + 'server 1m', + 'check 10s', + ], + 'maxconn' => '8000' + } } Debian: { - $haproxy_global_options = { 'log' => "${::ipaddress} local0", - 'chroot' => '/var/lib/haproxy', - 'pidfile' => '/var/run/haproxy.pid', - 'maxconn' => '4000', - 'user' => 'haproxy', - 'group' => 'haproxy', - 'daemon' => '', - 'stats' => 'socket /var/lib/haproxy/stats' - } - $haproxy_defaults_options = { 'log' => 'global', - 'stats' => 'enable', - 'option' => 'redispatch', - 'retries' => '3', - 'timeout' => ['http-request 10s', 'queue 1m', 'connect 10s', 'client 1m', 'server 1m', 'check 10s'], - 'maxconn' => '8000' - } + $haproxy_global_options = { + 'log' => "${::ipaddress} local0", + 'chroot' => '/var/lib/haproxy', + 'pidfile' => '/var/run/haproxy.pid', + 'maxconn' => '4000', + 'user' => 'haproxy', + 'group' => 'haproxy', + 'daemon' => '', + 'stats' => 'socket /var/lib/haproxy/stats' + } + $haproxy_defaults_options = { + 'log' => 'global', + 'stats' => 'enable', + 'option' => 'redispatch', + 'retries' => '3', + 'timeout' => [ + 'http-request 10s', + 'queue 1m', + 'connect 10s', + 'client 1m', + 'server 1m', + 'check 10s', + ], + 'maxconn' => '8000' + } } default: { fail("The $::osfamily operating system is not supported with the haproxy module") } } diff --git a/manifests/init.pp b/manifests/init.pp index f75051c..c36b1ae 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -31,29 +31,32 @@ # === Examples # # class { 'haproxy': -# enable => true, -# haproxy_global_options => { 'log' => "${::ipaddress} local0", -# 'chroot' => '/var/lib/haproxy', -# 'pidfile' => '/var/run/haproxy.pid', -# 'maxconn' => '4000', -# 'user' => 'haproxy', -# 'group' => 'haproxy', -# 'daemon' => '', -# 'stats' => 'socket /var/lib/haproxy/stats' -# }, -# haproxy_defaults_options => { 'log' => 'global', -# 'stats' => 'enable', -# 'option' => 'redispatch', -# 'retries' => '3', -# 'timeout' => ['http-request 10s', -# 'queue 1m', -# 'connect 10s', -# 'client 1m', -# 'server 1m', -# 'check 10s'], -# 'maxconn' => '8000' -# }, -# +# enable => true, +# haproxy_global_options => { +# 'log' => "${::ipaddress} local0", +# 'chroot' => '/var/lib/haproxy', +# 'pidfile' => '/var/run/haproxy.pid', +# 'maxconn' => '4000', +# 'user' => 'haproxy', +# 'group' => 'haproxy', +# 'daemon' => '', +# 'stats' => 'socket /var/lib/haproxy/stats' +# }, +# haproxy_defaults_options => { +# 'log' => 'global', +# 'stats' => 'enable', +# 'option' => 'redispatch', +# 'retries' => '3', +# 'timeout' => [ +# 'http-request 10s', +# 'queue 1m', +# 'connect 10s', +# 'client 1m', +# 'server 1m', +# 'check 10s' +# ], +# 'maxconn' => '8000' +# }, # } # # === Authors |