diff options
| -rwxr-xr-x | files/checkbackups.pl | 2 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 2 | ||||
| -rw-r--r-- | manifests/server.pp | 14 |
3 files changed, 7 insertions, 11 deletions
diff --git a/files/checkbackups.pl b/files/checkbackups.pl index 80fc07f..dba2b4a 100755 --- a/files/checkbackups.pl +++ b/files/checkbackups.pl @@ -61,7 +61,7 @@ if (defined($opt_o)) { @hosts=qx{hostname -f}; } else { # XXX: this should be a complete backup registry instead - @hosts=qx{ls $backupdir}; + @hosts=qx{ls $backupdir | grep -v lost+found}; } chdir($backupdir); diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 0156f12..1fc9abb 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -26,7 +26,7 @@ define backupninja::rdiff( "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false, - $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, $nagios2_description = 'backups') + $backuptag = false, $backupkeytype = "rsa", $backupkeystore = false, $extras = false, $nagios2_description = 'backups') { include backupninja::client::rdiff_backup diff --git a/manifests/server.pp b/manifests/server.pp index a0bcbf2..0b7ebb9 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -23,17 +23,13 @@ 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", - source => "puppet://$servername/backupninja/checkbackups.pl", + source => "puppet:///modules/backupninja/checkbackups.pl", mode => 0755, owner => root, group => root, } @@ -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"]) { |