From 7bcca1f939217c1c38fee637c28c81238ae180e2 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 24 Aug 2023 20:51:58 -0500 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 9f1f917b..9f7d7f3b 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -573,23 +573,22 @@ UPDATE_DYNDNS(){ BACKUP_OFFSITEPFSENSE(){ BAKFOLDER=/mnt/BU-Raid1/Offsite-pfSense_Backups - newBAKFOLDER=${BAKFOLDER}/`date +%Y%m%d-%H%M%S` + newBAKFOLDER=${BAKFOLDER}/`date +%Y%m%d-%H%M%S`-D mkdir ${newBAKFOLDER} ssh root@10.2.1.1 tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf scp root@10.2.1.1:/cf/conf/conf* ${newBAKFOLDER}/ ssh root@10.2.1.1 rm -f /cf/conf/conf_backup.tar.gz - [ "${BackupsToKeep}" == "" ] && BackupsToKeep=3 - files=(`ls -d ${BAKFOLDER}/* | tail -${BackupsToKeep}`) - for i in $(ls -d ${BAKFOLDER}/*); do + [ "${BackupsToKeep}" == "" ] && BackupsToKeep=2 + filestokeep=(`ls -d ${BAKFOLDER}/*-D | tail -${BackupsToKeep}`) + for i in $(ls -d ${BAKFOLDER}/*-D); do keep=0 - for a in ${files[@]}; do + for a in ${filestokeep[@]}; do [ "${i}" == "${a}" ] && keep=1 done; if [ $keep == 0 ]; then - echo ${i} - [ "$(date +%u)" == "1" ] && mv ${i} ${i}-W || rm -rf ${i} + [ "$(date +%u)" == "1" ] && mv ${i} ${i/-D/-W} || rm -rf ${i} fi done