diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 9c0e73a6..5faded6f 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -725,30 +725,26 @@ BACKUP_UNIFINVR(){ ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/root_backup.tar.gz /root ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/unifi_backup.tar.gz /volume1/.srv/unifi-protect/backups /volume1/.srv/unifi-protect/data /volume1/.srv/unifi-protect/dbBackups - if [ $(scp root@${UNIFINVR_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/) ]; then - echo yes - ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz - - 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 + scp root@${UNIFINVR_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/ + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz + + 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 no + echo "HERE 4"; + mv ${newBAKFOLDER} "${newBAKFOLDER}-D" fi dailyfilestokeep=(`ls -d ${BAKFOLDER}/*-D 2> /dev/null | tail -${DailyBackupsToKeep}`)