diff --git a/defaults.inc b/defaults.inc index ff218437..309cc224 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.53-01042024' +VERS='5.1.54-01042024' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index cc64c040..9133834c 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}`) @@ -559,7 +559,6 @@ BACKUP_OFFSITEPFSENSE(){ done; if [ $keep == 0 ]; then delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" - echo "Deleting: ${delFolder}" ssh backup@10.10.1.60 rmdir /S /Q "${delFolder}" fi fi @@ -630,7 +629,10 @@ BACKUP_UNIFIUDM(){ keep=1; break fi done; - [ $keep == 0 ] && delFolder="D:\\UniFi-UDM_Backups\\${folder##*/}" && ssh backup@10.10.1.60 rmdir "${delFolder}" + if [ $keep == 0 ]; then + delFolder="D:\\UniFi-UDM_Backups\\${folder##*/}" + ssh backup@10.10.1.60 rmdir /S /Q "${delFolder}" + fi fi done else @@ -701,7 +703,10 @@ BACKUP_UNIFINVR(){ keep=1; break fi done; - [ $keep == 0 ] && delFolder="D:\\UniFi-NVR_Backups\\${folder##*/}" && ssh backup@10.10.1.60 rmdir "${delFolder}" + if [ $keep == 0 ]; then + delFolder="D:\\UniFi-NVR_Backups\\${folder##*/}" + ssh backup@10.10.1.60 rmdir /S /Q "${delFolder}" + fi fi done else