diff --git a/defaults.inc b/defaults.inc index 1483b274..dc4e65ef 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.4.16-05102025' +VERS='5.4.18-05102025' 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 offsite-staticroute-fix ' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 5faded6f..a7575dc1 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -650,23 +650,22 @@ BACKUP_UNIFIUDM(){ ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/data_backup.tar.gz /data ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/root_backup.tar.gz /root - if [ $(scp root@${UNIFIUDM_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/) ]; then - ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_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 + scp root@${UNIFIUDM_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/ + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_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}`) @@ -730,20 +729,16 @@ BACKUP_UNIFINVR(){ cd ${BAKFOLDER} if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then - echo "HERE 1"; mv ${newBAKFOLDER} "${newBAKFOLDER}-M" ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-W" ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" elif [ "$(date +%d)" == "${DOM}" ]; then - echo "HERE 2"; mv ${newBAKFOLDER} "${newBAKFOLDER}-M" ln -s "${newBAKFOLDER}-M" "${newBAKFOLDER}-D" elif [ "$(date +%u)" == "${DOW}" ]; then - echo "HERE 3"; mv ${newBAKFOLDER} "${newBAKFOLDER}-W" ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-D" else - echo "HERE 4"; mv ${newBAKFOLDER} "${newBAKFOLDER}-D" fi