X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-dabackup-server;h=afe801b9cb629f5d619c83f38f5e15095941d657;hb=43c33d06c1d3d742bf0b7cd46e1ba5304c8a11fa;hp=8dba0c0089462c3d8a8ccdb0730d2ad8f0a4f5f7;hpb=08275064a9658cc5efde9976917f897c1a775cb1;p=mirror%2Fdsa-nagios.git

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"