diff --git a/calvados.sh b/calvados.sh index 034550d..fdfc8a1 100755 --- a/calvados.sh +++ b/calvados.sh @@ -1,3 +1,3 @@ #!/usr/bin/eval bash -#NAS_ROOT=/Users/hb/mnt/nas/backups +# nothing to do diff --git a/hamiller.sh b/hamiller.sh index 2181247..9905613 100755 --- a/hamiller.sh +++ b/hamiller.sh @@ -1,7 +1,5 @@ #!/usr/bin/eval bash - -#NAS_ROOT=/var/srv/nas/backups BACKUP_TARGET=/var/docker/tmp NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY" diff --git a/main.inc.sh b/main.inc.sh index 8b058ba..846fa3b 100755 --- a/main.inc.sh +++ b/main.inc.sh @@ -5,7 +5,7 @@ NAS_MOUNT_POINT="$(realpath $HERE/../../..)" # Server/bin/backup NAS_ROOT="$NAS_MOUNT_POINT/backups" LOG_FILE_PATH="$NAS_MOUNT_POINT/Server/log/backup" -log_file_name="$LOG_FILE_PATH/$HOST_NAME-$(date '+%Y-%m-%d_%H%M')" +log_file_name="$LOG_FILE_PATH/$HOST_NAME-$(date '+%Y-%m-%d_%H%M%S')" LOG_FILE="${log_file_name}.log" LOG_KEEP_DAYS=14 @@ -444,6 +444,13 @@ backup_daily() { prune_logs fi + # ggf. weekly backup parallel starten (z.ZT. nur auf NAS) + if [ $HAS_WEEKLY -a $WEEKLY_DAY -eq $DAY ]; then + log $DEBUG "$DBG starting weekly backup" + sleep 2 # wg. log name + nohup $THIS_SCRIPT -w >>$LOG_FILE 2>&1 >>>>>>>>> daily auto backup $VER for $HOST_NAME <<<<<<<<<<" do_auto_backup backup_daily @@ -457,11 +464,6 @@ backup_daily() { fix_acls send_mail_log "Daily Backup" - # ggf. weekly backup starten (z.ZT. nur auf NAS) - if [ $HAS_WEEKLY -a $WEEKLY_DAY -eq $DAY ]; then - log $DEBUG "$DBG starting weekly backup" - nohup $THIS_SCRIPT -w >>$LOG_FILE 2>&1 >>>>>>>>> weekly auto backup $VER for $HOST_NAME <<<<<<<<<<" diff --git a/main.sh b/main.sh index b1544af..f0d583e 100755 --- a/main.sh +++ b/main.sh @@ -3,7 +3,7 @@ # entrypoint for all actions # -VER="2.1.3" +VER="2.1.4" HERE=$(dirname "$0") THIS_SCRIPT=$0 @@ -95,7 +95,7 @@ while :; do shift 2 restore "$archive" "$@" else - echo 'ERROR: "--restore" requires a least the archive name as an argument.' + echo 'ERROR: "--restore" requires at least the archive name as an argument.' echo show_help fi diff --git a/nathan.sh b/nathan.sh index 573be54..67eb125 100755 --- a/nathan.sh +++ b/nathan.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -#NAS_ROOT=/var/srv/nas/backups DOCKER_ROOT=/var/docker BACKUP_TARGET=$DOCKER_ROOT/tmp NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY" diff --git a/synology.sh b/synology.sh index 00101a5..2752e3f 100755 --- a/synology.sh +++ b/synology.sh @@ -1,6 +1,5 @@ #!/usr/bin/eval bash -#NAS_ROOT=/volume1/nfs/backups HAS_WEEKLY=true backup_daily1() {