diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index e608ce7f..c31edf7d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -520,24 +520,24 @@ BACKUP_OFFSITEPFSENSE(){ WeeklyBackupsToKeep=8 MonthlyBackupsToKeep=3 - ssh root@${OFFSITE_PFSENSE_IP} tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf - scp root@${OFFSITE_PFSENSE_IP}:/cf/conf/conf* ${BAKFOLDER}/${newBAKFOLDER}/ - ssh root@${OFFSITE_PFSENSE_IP} rm -f /cf/conf/conf_backup.tar.gz - - cd ${BAKFOLDER} - if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then - mv ${newBAKFOLDER} "${newBAKFOLDER}-M" - ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W" - ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" - elif [ "$(date +%d)" == "${DOM}" ]; then - mv ${newBAKFOLDER} "${newBAKFOLDER}-M" - ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" - elif [ "$(date +%u)" == "${DOW}" ]; then - mv ${newBAKFOLDER} "${newBAKFOLDER}-W" - ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D" - else - mv ${newBAKFOLDER} "${newBAKFOLDER}-D" - fi + # ssh root@${OFFSITE_PFSENSE_IP} tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf + # scp root@${OFFSITE_PFSENSE_IP}:/cf/conf/conf* ${BAKFOLDER}/${newBAKFOLDER}/ + # ssh root@${OFFSITE_PFSENSE_IP} rm -f /cf/conf/conf_backup.tar.gz + # + # cd ${BAKFOLDER} + # if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then + # mv ${newBAKFOLDER} "${newBAKFOLDER}-M" + # ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W" + # ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" + # elif [ "$(date +%d)" == "${DOM}" ]; then + # mv ${newBAKFOLDER} "${newBAKFOLDER}-M" + # ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" + # elif [ "$(date +%u)" == "${DOW}" ]; then + # mv ${newBAKFOLDER} "${newBAKFOLDER}-W" + # ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D" + # else + # mv ${newBAKFOLDER} "${newBAKFOLDER}-D" + # fi dailyfilestokeep=(`ls -d ${BAKFOLDER}/*-D 2> /dev/null | tail -${DailyBackupsToKeep}`) weeklyfilestokeep=(`ls -d ${BAKFOLDER}/*-W 2> /dev/null | tail -${WeeklyBackupsToKeep}`) @@ -557,7 +557,10 @@ BACKUP_OFFSITEPFSENSE(){ keep=1; break fi done; - [ $keep == 0 ] && delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" && ssh backup@10.10.1.60 rmdir "${delFolder}" + if [ $keep == 0 ]; then + delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" + ssh backup@10.10.1.60 rmdir "${delFolder}" + fi fi done else