From: Zachary Vance Date: Thu, 7 Jul 2016 05:57:36 +0000 (-0700) Subject: Update backup mechansim X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=9987b0df5371c56e114ecefa913751df4e94935d;p=za3k.git Update backup mechansim --- diff --git a/cgi-bin/service.status.d/avalanche.backup b/cgi-bin/service.status.d/avalanche.backup index ccbaef7..3e8f382 100644 --- a/cgi-bin/service.status.d/avalanche.backup +++ b/cgi-bin/service.status.d/avalanche.backup @@ -1,8 +1,8 @@ -DEADTREE=$(ssh -i /var/www/.ssh/backup_check backup_status@burn.za3k.com /var/local/backup-status.sh | grep avalanche) -echo $DEADTREE +AVALANCHE=$(ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@burn.za3k.com | grep avalanche) +echo $AVALANCHE EXPECTED=$(date +"avalanche.%Y%m%d") -[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0 +[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0 EXPECTED=$(date --date="yesterday" +"avalanche.%Y%m%d") -[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0 +[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0 EXPECTED=$(date --date="2 days ago" +"avalanche.%Y%m%d") -[ "${DEADTREE}" = "${EXPECTED}" ] && exit 0 +[ "${AVALANCHE}" = "${EXPECTED}" ] && exit 0 diff --git a/cgi-bin/service.status.d/deadtree.backup b/cgi-bin/service.status.d/deadtree.backup index dd6d54a..5db9dce 100644 --- a/cgi-bin/service.status.d/deadtree.backup +++ b/cgi-bin/service.status.d/deadtree.backup @@ -1,4 +1,4 @@ -DEADTREE=$(ssh -i /var/www/.ssh/backup_check backup_status@burn.za3k.com /var/local/backup-status.sh | grep deadtree) +DEADTREE=$(ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@burn.za3k.com | grep deadtree) echo $DEADTREE EXPECTED=$(date +"deadtree.%Y%m%d") [ "${DEADTREE}" = "${EXPECTED}" ] && exit 0 diff --git a/cgi-bin/service.status.d/tarragon.backup b/cgi-bin/service.status.d/tarragon.backup index 2db5603..2b15815 100644 --- a/cgi-bin/service.status.d/tarragon.backup +++ b/cgi-bin/service.status.d/tarragon.backup @@ -1 +1 @@ -ssh -i /var/www/.ssh/backup_check backup_status@burn.za3k.com /var/local/backup-status.sh | grep tarragon +ssh -i /var/www/status/backup_check -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no backup_status@burn.za3k.com | grep tarragon