Move nagios::service::passive to handler classes so that local backups may also be monitored

manifests/duplicity.pp

@@ -138,5 +138,10 @@ define backupninja::duplicity( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+
 }
 

manifests/rdiff.pp

@@ -80,7 +80,6 @@ define backupninja::rdiff( $order  = 90,
         backuptag            => $backuptag,
         backupkeys           => $backupkeystore,
         keytype              => $backupkeytype,
-        nagios_description   => $nagios_description
       }
      
       backupninja::key { "${user}-${name}":
@@ -101,5 +100,10 @@ define backupninja::rdiff( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+
 }
   

manifests/rsync.pp

@@ -101,7 +101,6 @@ define backupninja::rsync( $order  = 90,
         backuptag            => $backuptag,
         keytype              => $backupkeytype,
         backupkeys           => $backupkeystore,
-        nagios_description   => $nagios_description
       }
      
       backupninja::key { "${user}-${name}":
@@ -121,4 +120,9 @@ define backupninja::rsync( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+
 }

manifests/server.pp

@@ -68,14 +68,8 @@ class backupninja::server (
     $uid = false,
     $gid = "backupninjas",
     $backuptag = "backupninja-${::fqdn}",
-    $nagios_description = 'backups'
   ) {
 
-    if $backupninja::manage_nagios {
-      # configure a passive service check for backups
-      nagios::service::passive { $nagios_description: }
-    }
-    
     if !defined(Backupninja_server_realize["${::fqdn}@${host}"]) {
       @@backupninja_server_realize { "${::fqdn}@${host}":
         host => $::fqdn,