From 1e7b51004868a762f577831e686d1b851e2b08c2 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
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/base.pp | 158 ++++++++++++++++++++++++++----------------------------
 1 file changed, 75 insertions(+), 83 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index bd55ff9..5c7045e 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,111 +1,103 @@
 class nagios::base {
 
-    # needs apache to work
-    include apache
-
-    package { nagios:
-        ensure => present,
+    package { 'nagios':
+        alias => 'nagios',
+        ensure => present,   
     }
 
-    service{nagios:
+    service { 'nagios':
         ensure => running,
         enable => true,
         #hasstatus => true, #fixme!
-        require => Package[nagios],
+        require => Package['nagios'],
     }
 
     # manage nagios cfg files
-    file {nagios_cfg_dir:
-        path => '/etc/nagios',
+    file { 'nagios_cfg_dir':
+        path => "${nagios_cfg_dir}/",
         source => "puppet://$server/modules/common/empty",
         ensure => directory,
         recurse => true,
         purge => true,
-        notify => Service[nagios],
+        notify => Service['nagios'],
         mode => 0755, owner => root, group => root;
     }
+
     # this file should contain all the nagios_puppet-paths:
-    file {nagios_main_cfg:
-            path => "/etc/nagios/nagios.cfg",
-      source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios.cfg",
-                        "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet://$server/modules/site-nagios/configs/nagios.cfg",
-                        "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet://$server/modules/nagios/configs/nagios.cfg" ],
-            notify => Service[nagios],
+    file { 'nagios_main_cfg':
+            path => "${nagios_cfg_dir}/nagios.cfg",
+            source => [ "puppet://$server/files/nagios/configs/${fqdn}/nagios.cfg",
+                        "puppet://$server/files/nagios/configs/${operatingsystem}/nagios.cfg",
+                        "puppet://$server/files/nagios/configs/nagios.cfg",
+                        "puppet://$server/nagios/configs/${operatingsystem}/nagios.cfg",
+                        "puppet://$server/nagios/configs/nagios.cfg" ],
+            notify => Service['nagios'],
             mode => 0644, owner => root, group => root;
-    }
-    file { nagios_cgi_cfg:
-        path => "/etc/nagios/cgi.cfg",
-        source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/cgi.cfg",
-                    "puppet://$server/modules/site-nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet://$server/modules/site-nagios/configs/cgi.cfg",
-                    "puppet://$server/modules/nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet://$server/modules/nagios/configs/cgi.cfg" ],
-        owner => 'root',
-        group => 0,
-        mode => '0644',
+    }    
+
+    file { 'nagios_cgi_cfg':
+        path => "${nagios_cfg_dir}/cgi.cfg",
+        source => [ "puppet://$server/files/nagios/configs/${fqdn}/cgi.cfg",
+                    "puppet://$server/files/nagios/configs/${operatingsystem}/cgi.cfg",
+                    "puppet://$server/files/nagios/configs/cgi.cfg",
+                    "puppet://$server/nagios/configs/${operatingsystem}/cgi.cfg",
+                    "puppet://$server/nagios/configs/cgi.cfg" ],
+        mode => '0644', owner => 'root', group => 0,
         notify => Service['apache'],
     }
 
-    file {"/etc/nagios/htpasswd.users":
-            source => [
-                "puppet://$server/modules/site-nagios/htpasswd.users",
-                "puppet://$server/modules/nagios/htpasswd.users" ],
-            mode => 0640, owner => root, group => apache;
+    file { 'nagios_htpasswd':
+        path => "${nagios_cfg_dir}/htpasswd.users",
+        source => [ "puppet://$server/files/nagios/htpasswd.users",
+                    "puppet://$server/nagios/htpasswd.users" ],
+        mode => 0640, owner => root, group => apache;
+    }
+
+    file { 'nagios_private':
+        path => "${nagios_cfg_dir}/private/",
+        source => "puppet://$server/nagios/empty",
+        ensure => directory,
+        purge => true,
+        recurse => true,
+        notify => Service['nagios'],
+        mode => '0750', owner => root, group => nagios;
     }
-    file{[ "/etc/nagios/nagios_command.cfg",
-           "/etc/nagios/nagios_contact.cfg",
-           "/etc/nagios/nagios_contactgroup.cfg",
-           "/etc/nagios/nagios_host.cfg",
-           "/etc/nagios/nagios_hostextinfo.cfg",
-           "/etc/nagios/nagios_hostgroup.cfg",
-           "/etc/nagios/nagios_hostgroupescalation.cfg",
-           "/etc/nagios/nagios_service.cfg",
-           "/etc/nagios/nagios_servicedependency.cfg",
-           "/etc/nagios/nagios_serviceescalation.cfg",
-           "/etc/nagios/nagios_serviceextinfo.cfg",
-           "/etc/nagios/nagios_timeperdiod.cfg" ]:
+
+    file { 'nagios_private_resource_cfg':
+        path => "${nagios_cfg_dir}/private/resource.cfg",
+        source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
+        notify => Service['nagios'],
+        owner => root, group => nagios, mode => '0640';
+    }
+
+    file { 'nagios_defaults':
+        path => "${nagios_cfg_dir}/defaults/",
+        source => "puppet://$server/nagios/empty",
+        ensure => directory,
+        purge => true,
+        recurse => true,
+        notify => Service['nagios'],
+        mode => '0755', owner => root, group => nagios;
+    }
+
+    file{[ "${nagios_cfg_dir}/nagios_command.cfg", 
+           "${nagios_cfg_dir}/nagios_contact.cfg", 
+           "${nagios_cfg_dir}/nagios_contactgroup.cfg",
+           "${nagios_cfg_dir}/nagios_host.cfg",
+           "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
+           "${nagios_cfg_dir}/nagios_hostgroup.cfg",
+           "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
+           "${nagios_cfg_dir}/nagios_service.cfg",
+           "${nagios_cfg_dir}/nagios_servicedependency.cfg",
+           "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
+           "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
+           "${nagios_cfg_dir}/nagios_timeperdiod.cfg" ]:
         ensure => file,
         replace => false,
-        notify => Service[nagios],
+        notify => Service['nagios'],
         mode => 0644, owner => root, group => 0;
     }
 
-    nagios::plugin{'check_jabber_login': }
-
-    nagios::command{
-        ssh_port:
-            command_line => '$USER1$/check_ssh -p $ARG1$ $HOSTADDRESS$';
-        # from apache2.pp
-        http_port:
-            command_line => '$USER1$/check_http -p $ARG1$ -H $HOSTADDRESS$ -I $HOSTADDRESS$';
-        # from bind.pp
-        check_dig2:
-           command_line => '$USER1$/check_dig -H $HOSTADDRESS$ -l $ARG1$ --record_type=$ARG2$';
-        check_ntp_time:
-            command_line => '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w 0.5 -c 1';
-        check_http_url:
-            command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$';
-        check_http_url_regex:
-            command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -e $ARG3$';
-        check_https_url:
-            command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$';
-        check_https_url_regex:
-            command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$';
-        check_https:
-            command_line => '$USER1$/check_http -S -H $HOSTADDRESS$';
-        check_silc:
-            command_line => '$USER1$/check_tcp -p 706 -H $ARG1$';
-        check_sobby:
-            command_line => '$USER1$/check_tcp -H $ARG1$ -p $ARG2$';
-        check_jabber:
-            command_line => '$USER1$/check_jabber -H $ARG1$';
-        check_jabber_login:
-            command_line => '$USER1$/check_jabber_login $ARG1$ $ARG2$',
-            require => Nagios::Plugin['check_jabber_login'];
-  }
-
     Nagios_command <<||>>
     Nagios_contact <<||>>
     Nagios_contactgroup <<||>>
@@ -124,10 +116,10 @@ class nagios::base {
     }
 
     if $nagios_allow_external_cmd {
-        file{'/var/spool/nagios/cmd':
+        file { '/var/spool/nagios/cmd':
             ensure => 'directory',
             require => Package['nagios'],
-            owner => apache, group => nagios, mode => 2660;
+            mode => 2660, owner => apache, group => nagios,
         }
     }
 }
-- 
cgit v1.2.3


From 4e58e67ded751306dc469f6f424f338e0400b38e Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 1 Dec 2009 15:54:53 -0500
Subject: use empty directory from common module

---
 manifests/base.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 5c7045e..30c3018 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -55,7 +55,7 @@ class nagios::base {
 
     file { 'nagios_private':
         path => "${nagios_cfg_dir}/private/",
-        source => "puppet://$server/nagios/empty",
+        source => "puppet://$server/modules/common/empty",
         ensure => directory,
         purge => true,
         recurse => true,
@@ -72,7 +72,7 @@ class nagios::base {
 
     file { 'nagios_defaults':
         path => "${nagios_cfg_dir}/defaults/",
-        source => "puppet://$server/nagios/empty",
+        source => "puppet://$server/modules/common/empty",
         ensure => directory,
         purge => true,
         recurse => true,
-- 
cgit v1.2.3


From 65f58d903aa2a6a7c4bf4aa16608367af222d002 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 2 Dec 2009 11:03:01 -0500
Subject: don't use /files/, that is un-0.25.x-ish

---
 manifests/base.pp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 30c3018..8f0a03c 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -26,30 +26,30 @@ class nagios::base {
     # this file should contain all the nagios_puppet-paths:
     file { 'nagios_main_cfg':
             path => "${nagios_cfg_dir}/nagios.cfg",
-            source => [ "puppet://$server/files/nagios/configs/${fqdn}/nagios.cfg",
-                        "puppet://$server/files/nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet://$server/files/nagios/configs/nagios.cfg",
-                        "puppet://$server/nagios/configs/${operatingsystem}/nagios.cfg",
-                        "puppet://$server/nagios/configs/nagios.cfg" ],
+            source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios.cfg",
+                        "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios.cfg",
+                        "puppet://$server/modules/site-nagios/configs/nagios.cfg",
+                        "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios.cfg",
+                        "puppet://$server/modules/nagios/configs/nagios.cfg" ],
             notify => Service['nagios'],
             mode => 0644, owner => root, group => root;
     }    
 
     file { 'nagios_cgi_cfg':
         path => "${nagios_cfg_dir}/cgi.cfg",
-        source => [ "puppet://$server/files/nagios/configs/${fqdn}/cgi.cfg",
-                    "puppet://$server/files/nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet://$server/files/nagios/configs/cgi.cfg",
-                    "puppet://$server/nagios/configs/${operatingsystem}/cgi.cfg",
-                    "puppet://$server/nagios/configs/cgi.cfg" ],
+        source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/cgi.cfg",
+                    "puppet://$server/modules/site-nagios/configs/${operatingsystem}/cgi.cfg",
+                    "puppet://$server/modules/site-nagios/configs/cgi.cfg",
+                    "puppet://$server/modules/nagios/configs/${operatingsystem}/cgi.cfg",
+                    "puppet://$server/modules/nagios/configs/cgi.cfg" ],
         mode => '0644', owner => 'root', group => 0,
         notify => Service['apache'],
     }
 
     file { 'nagios_htpasswd':
         path => "${nagios_cfg_dir}/htpasswd.users",
-        source => [ "puppet://$server/files/nagios/htpasswd.users",
-                    "puppet://$server/nagios/htpasswd.users" ],
+        source => [ "puppet://$server/modules/site-nagios/nagios/htpasswd.users",
+                    "puppet://$server/modules/nagios/htpasswd.users" ],
         mode => 0640, owner => root, group => apache;
     }
 
-- 
cgit v1.2.3


From 5337f09880f5f2e7774564331b367786e6ccfa5a Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 2 Dec 2009 15:06:57 -0500
Subject: adjust htpasswd.users path

---
 manifests/base.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 8f0a03c..71a190a 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -48,7 +48,7 @@ class nagios::base {
 
     file { 'nagios_htpasswd':
         path => "${nagios_cfg_dir}/htpasswd.users",
-        source => [ "puppet://$server/modules/site-nagios/nagios/htpasswd.users",
+        source => [ "puppet://$server/modules/site-nagios/htpasswd.users",
                     "puppet://$server/modules/nagios/htpasswd.users" ],
         mode => 0640, owner => root, group => apache;
     }
-- 
cgit v1.2.3


From 3c15393af5c8fb0c7d66ece27a70b86709f1af82 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 2 Dec 2009 15:19:19 -0500
Subject: override exported resources to set notify and target path

---
 manifests/base.pp | 96 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 23 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 71a190a..4ee8097 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -12,17 +12,6 @@ class nagios::base {
         require => Package['nagios'],
     }
 
-    # manage nagios cfg files
-    file { 'nagios_cfg_dir':
-        path => "${nagios_cfg_dir}/",
-        source => "puppet://$server/modules/common/empty",
-        ensure => directory,
-        recurse => true,
-        purge => true,
-        notify => Service['nagios'],
-        mode => 0755, owner => root, group => root;
-    }
-
     # this file should contain all the nagios_puppet-paths:
     file { 'nagios_main_cfg':
             path => "${nagios_cfg_dir}/nagios.cfg",
@@ -80,6 +69,68 @@ class nagios::base {
         mode => '0755', owner => root, group => nagios;
     }
 
+    Nagios_command <<||>>
+    Nagios_contact <<||>>
+    Nagios_contactgroup <<||>>
+    Nagios_host <<||>>
+    Nagios_hostextinfo <<||>>
+    Nagios_hostgroup <<||>>
+    Nagios_hostgroupescalation <<||>>
+    Nagios_service <<||>>
+    Nagios_servicedependency <<||>>
+    Nagios_serviceescalation <<||>>
+    Nagios_serviceextinfo <<||>>
+    Nagios_timeperiod <<||>>
+
+    Nagios_command <||> {
+        target => "${nagios_cfg_dir}/nagios_command.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_contact <||> {
+        target => "${nagios_cfg_dir}/nagios_contact.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_contactgroup <||> {
+        target => "${nagios_cfg_dir}/nagios_contactgroup.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_host <||> {
+        target => "${nagios_cfg_dir}/nagios_host.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_hostextinfo <||> {
+        target => "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_hostgroup <||> {
+        target => "${nagios_cfg_dir}/nagios_hostgroup.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_hostgroupescalation <||> {
+        target => "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_service <||> {
+        target => "${nagios_cfg_dir}/nagios_service.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_servicedependency <||> {
+        target => "${nagios_cfg_dir}/nagios_servicedependency.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_serviceescalation <||> {
+        target => "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_serviceextinfo <||> {
+        target => "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
+        notify => Service['nagios'],
+    }
+    Nagios_timeperiod <||> {
+        target => "${nagios_cfg_dir}/nagios_timeperiod.cfg",
+        notify => Service['nagios'],
+    }
+
     file{[ "${nagios_cfg_dir}/nagios_command.cfg", 
            "${nagios_cfg_dir}/nagios_contact.cfg", 
            "${nagios_cfg_dir}/nagios_contactgroup.cfg",
@@ -98,18 +149,17 @@ class nagios::base {
         mode => 0644, owner => root, group => 0;
     }
 
-    Nagios_command <<||>>
-    Nagios_contact <<||>>
-    Nagios_contactgroup <<||>>
-    Nagios_host <<||>>
-    Nagios_hostextinfo <<||>>
-    Nagios_hostgroup <<||>>
-    Nagios_hostgroupescalation <<||>>
-    Nagios_service <<||>>
-    Nagios_servicedependency <<||>>
-    Nagios_serviceescalation <<||>>
-    Nagios_serviceextinfo <<||>>
-    Nagios_timeperiod <<||>>
+    # manage nagios cfg files
+    # must be defined after exported resource overrides and cfg file defs
+    file { 'nagios_cfg_dir':
+        path => "${nagios_cfg_dir}/",
+        source => "puppet://$server/modules/common/empty",
+        ensure => directory,
+        recurse => true,
+        purge => true,
+        notify => Service['nagios'],
+        mode => 0755, owner => root, group => root;
+    }
 
     if $use_munin {
         include munin::plugins::nagios
-- 
cgit v1.2.3


From fdaba117fb5b58adb73ba20046dada3cf9247161 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 2 Dec 2009 17:39:46 -0500
Subject: move puppet nagios resources down into conf.d

---
 manifests/base.pp | 72 ++++++++++++++++++++++++-------------------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 4ee8097..81cd3cb 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -14,7 +14,7 @@ class nagios::base {
 
     # this file should contain all the nagios_puppet-paths:
     file { 'nagios_main_cfg':
-            path => "${nagios_cfg_dir}/nagios.cfg",
+            path => "${nagios_cfgdir}/nagios.cfg",
             source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios.cfg",
                         "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios.cfg",
                         "puppet://$server/modules/site-nagios/configs/nagios.cfg",
@@ -25,7 +25,7 @@ class nagios::base {
     }    
 
     file { 'nagios_cgi_cfg':
-        path => "${nagios_cfg_dir}/cgi.cfg",
+        path => "${nagios_cfgdir}/cgi.cfg",
         source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/cgi.cfg",
                     "puppet://$server/modules/site-nagios/configs/${operatingsystem}/cgi.cfg",
                     "puppet://$server/modules/site-nagios/configs/cgi.cfg",
@@ -36,14 +36,14 @@ class nagios::base {
     }
 
     file { 'nagios_htpasswd':
-        path => "${nagios_cfg_dir}/htpasswd.users",
+        path => "${nagios_cfgdir}/htpasswd.users",
         source => [ "puppet://$server/modules/site-nagios/htpasswd.users",
                     "puppet://$server/modules/nagios/htpasswd.users" ],
         mode => 0640, owner => root, group => apache;
     }
 
     file { 'nagios_private':
-        path => "${nagios_cfg_dir}/private/",
+        path => "${nagios_cfgdir}/private/",
         source => "puppet://$server/modules/common/empty",
         ensure => directory,
         purge => true,
@@ -53,22 +53,12 @@ class nagios::base {
     }
 
     file { 'nagios_private_resource_cfg':
-        path => "${nagios_cfg_dir}/private/resource.cfg",
+        path => "${nagios_cfgdir}/private/resource.cfg",
         source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
         notify => Service['nagios'],
         owner => root, group => nagios, mode => '0640';
     }
 
-    file { 'nagios_defaults':
-        path => "${nagios_cfg_dir}/defaults/",
-        source => "puppet://$server/modules/common/empty",
-        ensure => directory,
-        purge => true,
-        recurse => true,
-        notify => Service['nagios'],
-        mode => '0755', owner => root, group => nagios;
-    }
-
     Nagios_command <<||>>
     Nagios_contact <<||>>
     Nagios_contactgroup <<||>>
@@ -83,66 +73,66 @@ class nagios::base {
     Nagios_timeperiod <<||>>
 
     Nagios_command <||> {
-        target => "${nagios_cfg_dir}/nagios_command.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_command.cfg",
         notify => Service['nagios'],
     }
     Nagios_contact <||> {
-        target => "${nagios_cfg_dir}/nagios_contact.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_contact.cfg",
         notify => Service['nagios'],
     }
     Nagios_contactgroup <||> {
-        target => "${nagios_cfg_dir}/nagios_contactgroup.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
         notify => Service['nagios'],
     }
     Nagios_host <||> {
-        target => "${nagios_cfg_dir}/nagios_host.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_host.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostextinfo <||> {
-        target => "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostgroup <||> {
-        target => "${nagios_cfg_dir}/nagios_hostgroup.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostgroupescalation <||> {
-        target => "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
         notify => Service['nagios'],
     }
     Nagios_service <||> {
-        target => "${nagios_cfg_dir}/nagios_service.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_service.cfg",
         notify => Service['nagios'],
     }
     Nagios_servicedependency <||> {
-        target => "${nagios_cfg_dir}/nagios_servicedependency.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
         notify => Service['nagios'],
     }
     Nagios_serviceescalation <||> {
-        target => "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
         notify => Service['nagios'],
     }
     Nagios_serviceextinfo <||> {
-        target => "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
         notify => Service['nagios'],
     }
     Nagios_timeperiod <||> {
-        target => "${nagios_cfg_dir}/nagios_timeperiod.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_timeperiod.cfg",
         notify => Service['nagios'],
     }
 
-    file{[ "${nagios_cfg_dir}/nagios_command.cfg", 
-           "${nagios_cfg_dir}/nagios_contact.cfg", 
-           "${nagios_cfg_dir}/nagios_contactgroup.cfg",
-           "${nagios_cfg_dir}/nagios_host.cfg",
-           "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
-           "${nagios_cfg_dir}/nagios_hostgroup.cfg",
-           "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
-           "${nagios_cfg_dir}/nagios_service.cfg",
-           "${nagios_cfg_dir}/nagios_servicedependency.cfg",
-           "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
-           "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
-           "${nagios_cfg_dir}/nagios_timeperdiod.cfg" ]:
+    file{[ "${nagios_cfgdir}/conf.d/nagios_command.cfg", 
+           "${nagios_cfgdir}/conf.d/nagios_contact.cfg", 
+           "${nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_host.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_service.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_timeperdiod.cfg" ]:
         ensure => file,
         replace => false,
         notify => Service['nagios'],
@@ -151,8 +141,8 @@ class nagios::base {
 
     # manage nagios cfg files
     # must be defined after exported resource overrides and cfg file defs
-    file { 'nagios_cfg_dir':
-        path => "${nagios_cfg_dir}/",
+    file { 'nagios_cfgdir':
+        path => "${nagios_cfgdir}/",
         source => "puppet://$server/modules/common/empty",
         ensure => directory,
         recurse => true,
-- 
cgit v1.2.3


From 8da16f874a06641b6af1fdf7685eff6f954863df Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 2 Dec 2009 18:35:56 -0500
Subject: manage /conf.d and fix nagios cfg filename

---
 manifests/base.pp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 81cd3cb..0fb0e89 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -59,6 +59,16 @@ class nagios::base {
         owner => root, group => nagios, mode => '0640';
     }
 
+    file { 'nagios_confd':
+        path => "${nagios_cfgdir}/conf.d/",
+        source => "puppet://$server/modules/common/empty",
+        ensure => directory,
+        purge => true,
+        recurse => true,
+        notify => Service['nagios'],
+        mode => '0750', owner => root, group => nagios;
+    }
+
     Nagios_command <<||>>
     Nagios_contact <<||>>
     Nagios_contactgroup <<||>>
@@ -132,7 +142,7 @@ class nagios::base {
            "${nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
            "${nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
            "${nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
-           "${nagios_cfgdir}/conf.d/nagios_timeperdiod.cfg" ]:
+           "${nagios_cfgdir}/conf.d/nagios_timeperiod.cfg" ]:
         ensure => file,
         replace => false,
         notify => Service['nagios'],
-- 
cgit v1.2.3


From 507956dedaf0b1852574553f0d2ffea55fd1f94f Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 4 Dec 2009 17:15:04 -0500
Subject: port the 'nagios_allow_external_cmd' switch to debian

---
 manifests/base.pp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 0fb0e89..8cf1774 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -165,11 +165,4 @@ class nagios::base {
         include munin::plugins::nagios
     }
 
-    if $nagios_allow_external_cmd {
-        file { '/var/spool/nagios/cmd':
-            ensure => 'directory',
-            require => Package['nagios'],
-            mode => 2660, owner => apache, group => nagios,
-        }
-    }
 }
-- 
cgit v1.2.3


From 218060f10ef3fd9278d276802cd149161900e6f5 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 1 Feb 2010 15:28:37 -0500
Subject: add munin plugin for nagios server

---
 manifests/base.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 8cf1774..6106ab2 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -162,7 +162,7 @@ class nagios::base {
     }
 
     if $use_munin {
-        include munin::plugins::nagios
+        include nagios::munin
     }
 
 }
-- 
cgit v1.2.3