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

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 0ad8c2c26203f807862c16d9aad54e3313904c18..a05da876b4c96669690b317029a03037694ad5b9 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -138,5 +138,10 @@ define backupninja::duplicity( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }

+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+

 }
 
 }
 

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index a20077f466b0340bda707b56100e603bd4ef1a9e..cd73d22c1a9daa1d3cb22d40fdaf61c77e358761 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -80,7 +80,6 @@ define backupninja::rdiff( $order  = 90,
         backuptag            => $backuptag,
         backupkeys           => $backupkeystore,
         keytype              => $backupkeytype,
         backuptag            => $backuptag,
         backupkeys           => $backupkeystore,
         keytype              => $backupkeytype,

-        nagios_description   => $nagios_description

       }
      
       backupninja::key { "${user}-${name}":
       }
      
       backupninja::key { "${user}-${name}":


@@ -101,5 +100,10 @@ define backupninja::rdiff( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }

+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+

 }
   
 }
   

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 145fdadaeeeedd7dea2790cce42135ae97910501..fc59950b3f33372bff823a6b1f190d2842870b56 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -101,7 +101,6 @@ define backupninja::rsync( $order  = 90,
         backuptag            => $backuptag,
         keytype              => $backupkeytype,
         backupkeys           => $backupkeystore,
         backuptag            => $backuptag,
         keytype              => $backupkeytype,
         backupkeys           => $backupkeystore,

-        nagios_description   => $nagios_description

       }
      
       backupninja::key { "${user}-${name}":
       }
      
       backupninja::key { "${user}-${name}":


@@ -121,4 +120,9 @@ define backupninja::rsync( $order  = 90,
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }
     mode    => 0600,
     require => File["${backupninja::configdir}"]
   }

+
+  if $backupninja::manage_nagios {
+    nagios::service::passive { $nagios_description: }
+  }
+

 }
 }

diff --git a/manifests/server.pp b/manifests/server.pp
index f7be21eabd692b67c589da74d9cf207e3e7784de..49e42a0f33963551a63130411c7bd24fa4054e66 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -68,14 +68,8 @@ class backupninja::server (
     $uid = false,
     $gid = "backupninjas",
     $backuptag = "backupninja-${::fqdn}",
     $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,
     if !defined(Backupninja_server_realize["${::fqdn}@${host}"]) {
       @@backupninja_server_realize { "${::fqdn}@${host}":
         host => $::fqdn,