From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 9 Feb 2010 14:40:19 +0000 (-0500)
Subject: update nagios object definitions to fit latest nagios module
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3f1417341b8357890997bc1a5157e19094ce9a2a;p=puppet-backupninja.git

update nagios object definitions to fit latest nagios module
---

diff --git a/manifests/server.pp b/manifests/server.pp
index a0bcbf2..27ceb59 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -23,13 +23,9 @@ class backupninja::server {
     mode => 0710, owner => root, group => "backupninjas"
   }
 
-  if $nagios_server {
+  if $use_nagios {
 
-    if !defined(Package["nsca"]) {
-      package { "nsca":
-        ensure => installed;
-      }
-    }
+    include nagios::nsca::client
     
     file { "/usr/local/bin/checkbackups":
       ensure => "present",
@@ -100,9 +96,9 @@ class backupninja::server {
       default => $nagios2_description,
     }
 
-    if $nagios_server {
+    if $use_nagios {
       # configure a passive service check for backups
-      nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
+      nagios::service::passive { $nagios2_description: }
     }
     
     if !defined(File["$real_dir"]) {