update nagios object definitions to fit latest nagios module

diff --git a/manifests/server.pp b/manifests/server.pp
index a0bcbf26bb4019a1bd59d7ae9d8c317c7d1f0b01..27ceb593f0c8541616f6f995cda0368687806059 100644 (file)
--- 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"]) {