From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 7 Jun 2010 02:40:31 +0000 (-0300)
Subject: Initial nagios support
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3c41c630e12d91187b11c8facee3032691cf3ee5;p=puppet-nodo.git

Initial nagios support
---

diff --git a/manifests/init.pp b/manifests/init.pp
index c9e5329..157b4db 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,6 +38,7 @@ import "postfix"
 import "reprepro"
 import "ssl"
 import "autossh"
+import "nagios"
 
 # Import subsystems
 import "subsystems/firewall.pp"
diff --git a/manifests/master.pp b/manifests/master.pp
index e6d7722..5e1c049 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -7,6 +7,7 @@ class nodo::master {
   if $main_master == true {
     include puppetmasterd
     include munin::host
+    include nagios
 
     # The main master has a host entry pointing to itself, other
     # masters still retrieve catalogs from the main master.
diff --git a/manifests/physical.pp b/manifests/physical.pp
index 51fd155..4b16d4e 100644
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -9,6 +9,7 @@ class nodo::physical inherits nodo {
   include ups
   include utils::physical
   include smartmontools
+  include nagios::target
 
   # Time configuration
   case $ntpdate {