always add the directory name to service

diff --git a/files/checkbackups.pl b/files/checkbackups.pl
index 0ea48058f47cbfed731da21ca8f625837ea376b2..8cef40857e9b949fd2510c337ac37b7543d45dca 100755 (executable)
--- a/files/checkbackups.pl
+++ b/files/checkbackups.pl
@@ -76,14 +76,8 @@ sub check_rdiff {
     }
     close(FLAG);
     ($state, $delta) = check_age($last_bak);
-    $dir =~ /([^\/]*)\/rdiff-backup/;
-    if ($1 ne $host) {
-        # special subdir backup
-        $service = "backups-$1";
-    }
-    else {
-        $service = 'backups';
-    }
+    $dir =~ /([^\/]+)\/?$/;
+    $service = "backups-$1";
     print_status($host, $state, "$delta hours old$extra_msg", $service);
     foreach my $vserver_dir (@vserver_dirs) {
         $vsdir = "$dir/$vserver_dir";