From 1e7b51004868a762f577831e686d1b851e2b08c2 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Tue, 1 Dec 2009 13:33:36 -0500 Subject: Add support for Debian; split up package defaults and create new nagios::default resource; add support for lighttpd and headless httpd configurations; move common commands definitions into nagios::commands --- manifests/init.pp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 6eca55f..3d40ed6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,8 +15,21 @@ # class nagios { + case $nagios_httpd { + 'absent': { } + 'lighttpd': { include lighttpd } + 'apache': { include apache } + default: { include apache } + } case $operatingsystem { - centos: { include nagios::centos } + 'centos': { + $nagios_cfg_dir = '/etc/nagios' + include nagios::centos + } + 'debian': { + $nagios_cfg_dir = '/etc/nagios3' + include nagios::debian + } default: { fail("No such operatingsystem: $operatingsystem yet defined") } } } -- cgit v1.2.3 From fdaba117fb5b58adb73ba20046dada3cf9247161 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 2 Dec 2009 17:39:46 -0500 Subject: move puppet nagios resources down into conf.d --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/init.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 3d40ed6..1aecc3a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,11 +23,11 @@ class nagios { } case $operatingsystem { 'centos': { - $nagios_cfg_dir = '/etc/nagios' + $nagios_cfgdir = '/etc/nagios' include nagios::centos } 'debian': { - $nagios_cfg_dir = '/etc/nagios3' + $nagios_cfgdir = '/etc/nagios3' include nagios::debian } default: { fail("No such operatingsystem: $operatingsystem yet defined") } -- cgit v1.2.3