From 8a56bba7a7ac6376627e64be00d3ca2db14fdf71 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Tue, 12 Jun 2012 19:16:02 -0700 Subject: Add Debian support. This pull requests performs the minimum amount of effort to add Debian support. Adds Debian defaults (which were made to be as similar as possible to the Redhat defaults) Adds two Debian specific resources to the haproxy class - a defaults file to ensure the service is started - creates the /var/lib/haproxy directory so that the configuration can be as similar to Redhat as possible.y --- manifests/data.pp | 18 ++++++++++++++++++ manifests/init.pp | 13 +++++++++++++ 2 files changed, 31 insertions(+) (limited to 'manifests') diff --git a/manifests/data.pp b/manifests/data.pp index aa49285..db865d6 100644 --- a/manifests/data.pp +++ b/manifests/data.pp @@ -24,6 +24,24 @@ class haproxy::data { 'maxconn' => '8000' } } + Debian: { + $haproxy_global_options = { 'log' => "127.0.0.1 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 $::operatingsystem operating system is not supported with the haproxy module") } } } diff --git a/manifests/init.pp b/manifests/init.pp index 8005aec..8fc46ac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -97,6 +97,19 @@ class haproxy ( order => '10', content => template('haproxy/haproxy-base.cfg.erb'), } + + if ($::operatingsystem == 'Ubuntu') { + file { '/etc/default/haproxy': + content => 'ENABLED=1', + require => Package['haproxy'] + } + } + + file { '/var/lib/haproxy': + ensure => directory, + before => Service['haproxy'], + } + } service { 'haproxy': -- cgit v1.2.3