From ebc974dcc96b4ba41bfb4e033414da9722ffbb3b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 12 Feb 2010 13:06:23 +0100 Subject: [PATCH] check /etc/ssh/userkeys/root instead of /root/.ssh/authorized_keys --- dsa-nagios-checks/checks/dsa-check-dabackup-server | 8 +++++--- dsa-nagios-checks/debian/changelog | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-dabackup-server b/dsa-nagios-checks/checks/dsa-check-dabackup-server index 8dba0c0..afe801b 100755 --- a/dsa-nagios-checks/checks/dsa-check-dabackup-server +++ b/dsa-nagios-checks/checks/dsa-check-dabackup-server @@ -26,6 +26,8 @@ set -e set -u +AUTHKEYSFILE=/etc/ssh/userkeys/root + err=0 log() { @@ -67,14 +69,14 @@ done rsync_targets=`tempfile` backup_manager_sources=`tempfile` trap "rm -f '$rsync_targets' '$backup_manager_sources'" 0 1 2 5 15 -cat /root/.ssh/authorized_keys | +cat "$AUTHKEYSFILE" | grep '^command=' | sed -e 's/",no-por.*//' -e 's/.*--ignore-errors . //' -e 's#/org/backup.debian.org/staging/##' | grep -v 'command="/usr/lib/da-backup/da-backup-ssh-wrap ' | sort > "$rsync_targets" -wildcard_hosts=`cat /root/.ssh/authorized_keys | grep 'command="/usr/lib/da-backup/da-backup-ssh-wrap ' | sed -e 's/.*da-backup-ssh-wrap \([a-z0-9.]*\)".*/\1/' | tr '\n' '|' | sed 's/|$//'` -grep -h source /etc/da-backup-manager/* | +wildcard_hosts=`cat "$AUTHKEYSFILE" | grep 'command="/usr/lib/da-backup/da-backup-ssh-wrap ' | sed -e 's/.*da-backup-ssh-wrap \([a-z0-9.]*\)".*/\1/' | tr '\n' '|' | sed 's/|$//'` +grep -h '^source' /etc/da-backup-manager/* | sed -e 's/source=//' | egrep -v "^($wildcard_hosts)/" | sort > "$backup_manager_sources" diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index fdccdb9..4f58caf 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -18,8 +18,10 @@ dsa-nagios-checks (8x) unstable; urgency=low libnet-dns-sec-perl). * dsa-check-raid-aacraid: properly support beethoven's Adaptec AAC-RAID controller with a battery: "ZMM Optimal" is the way it says "optimal". + * dsa-check-dabackup-server: check /etc/ssh/userkeys/root instead of + /root/.ssh/authorized_keys. - -- Peter Palfrader Thu, 11 Feb 2010 19:23:15 +0100 + -- Peter Palfrader Fri, 12 Feb 2010 13:05:12 +0100 dsa-nagios-checks (84) unstable; urgency=low -- 2.20.1