From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 14 Apr 2008 16:14:44 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080414161444-rq732slf8yuersiu]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bec747260a5a995578ccbf9729757beb2b53c5c3;hp=7bcf376e1b75f2fb09dd7d99c19b216d4aba066f;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080414161444-rq732slf8yuersiu]
dsa-check-dabackup: Warn if installed but no backups configured
---

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index d3de5de..397aa95 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,9 @@
+dsa-nagios-nrpe-config (26) unstable; urgency=low
+
+  * dsa-check-dabackup: Warn if installed but no backups configured.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 14 Apr 2008 12:13:30 -0400
+
 dsa-nagios-nrpe-config (25) unstable; urgency=low
 
   * Install dsa-check-dabackup
diff --git a/dsa-nagios-nrpe-config/dsa-check-dabackup b/dsa-nagios-nrpe-config/dsa-check-dabackup
index 77dca8f..d00dcf2 100755
--- a/dsa-nagios-nrpe-config/dsa-check-dabackup
+++ b/dsa-nagios-nrpe-config/dsa-check-dabackup
@@ -116,14 +116,15 @@ for my $f (keys %conffiles) {
 		problem('WARNING', "$f has no log");
 	}
 }
-for my $f (keys %logfiles) {
+problem('WARNING', 'da-backup installed but no backups configured') if (scalar keys %conffiles == 0);
+
+FILE:
+for my $f (sort {$a cmp $b} keys %logfiles) {
 	unless (exists $conffiles{$f}) {
 		problem('WARNING', "log $f has no config");
+		next;
 	}
-}
 
-FILE:
-for my $f (keys %logfiles) {
 	my @stat = stat("$logdir/$f") or die ("Cannot stat $logdir/$f: $!\n");
 	my $age = time - $stat[10];
 	if ($age < 0) {