Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf8c226bbe | ||
|
|
5696e01322 | ||
|
|
f96447d0e7 | ||
|
|
8eccb0ed59 | ||
|
|
6efd48d3c6 | ||
|
|
16c8f1afce |
No files matched your search
@@ -3,4 +3,4 @@
|
||||
HERE=$(dirname "$0")
|
||||
|
||||
# local start
|
||||
sudo sh -c "nohup $HERE/main.sh -d </dev/null &"
|
||||
sudo sh -c "nohup $HERE/main.sh --dx </dev/null &"
|
||||
+1
-1
@@ -28,6 +28,6 @@ after_backup() {
|
||||
copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
|
||||
let rc=rc+$?
|
||||
#check_services
|
||||
let rc=rc+$?
|
||||
#let rc=rc+$?
|
||||
return $rc
|
||||
}
|
||||
+11
-7
@@ -26,7 +26,7 @@ LIST_EXT=list
|
||||
SYNO_USB=/usr/syno/bin/synousbdisk
|
||||
SYSTEMCTL_USER="/usr/bin/systemctl --user --machine=container@"
|
||||
SYSTEMCTL="/usr/bin/systemctl"
|
||||
PODMAN=" sudo -u container podman"
|
||||
PODMAN=" sudo -u container -i podman"
|
||||
CONTAINER_EXEC_USER=" $PODMAN exec"
|
||||
CONTAINER_SVC_UPDATE_USER=" $PODMAN auto-update"
|
||||
CONTAINER_EXEC="podman exec"
|
||||
@@ -200,7 +200,7 @@ do_start_stop_containers() {
|
||||
update_services() {
|
||||
log $DEBUG "$DBG update_services()"
|
||||
mail_log $INFO "$INF update services"
|
||||
local upd=$($CONTAINER_SVC_UPDATE_USER 2>&1 | tee $LOG_FILE | egrep 'registry\s+true' | sed 's/^.* \([^[:space:]]*\/[^[:space:]]*\).*$/\1/g')
|
||||
local upd=$($CONTAINER_SVC_UPDATE_USER 2>&1 | tee -a $LOG_FILE | egrep 'registry\s+true' | sed 's/^.* \([^[:space:]]*\/[^[:space:]]*\).*$/\1/g')
|
||||
check_pipe_rc ${PIPESTATUS[@]}
|
||||
local rc=$?
|
||||
for i in $upd; do
|
||||
@@ -435,8 +435,8 @@ backup_dir() {
|
||||
local root=$1
|
||||
local archive=$2
|
||||
local dir=$3
|
||||
log $DEBUG "$DBG > tar -c -z --numeric-owner --one-file-system --exclude \"@eaDir\" -C \"$root\" \"$dir\" | gpg --batch -c --passphrase xxxx -o \"$archive\""
|
||||
tar -c -z --numeric-owner --one-file-system --exclude "@eaDir" -C "$root" "$dir" 2>>$LOG_FILE | gpg --batch -c --passphrase $PASSPHRASE -o "$archive" 2>>$LOG_FILE
|
||||
log $DEBUG "$DBG > tar -c -z --numeric-owner --one-file-system --sort=name --exclude \"@eaDir\" -C \"$root\" \"$dir\" | gpg --batch -c --passphrase xxxx -o \"$archive\""
|
||||
tar -c -z --numeric-owner --one-file-system --sort=name --exclude "@eaDir" -C "$root" "$dir" 2>>$LOG_FILE | gpg --batch -c --passphrase $PASSPHRASE -o "$archive" 2>>$LOG_FILE
|
||||
check_pipe_rc ${PIPESTATUS[@]}
|
||||
return $?
|
||||
}
|
||||
@@ -495,11 +495,11 @@ set_log_info() {
|
||||
mail_log $INFO ">>> "
|
||||
}
|
||||
|
||||
backup_daily() {
|
||||
cron_backup_daily() {
|
||||
# "master"-Server startet Backup auf NAS
|
||||
if [ -d $BACKUP_MASTER_CHECK ]; then
|
||||
log $DEBUG "$DBG starting daily backup on $NAS_HOSTNAME"
|
||||
run_script_remote $NAS_IP "$NAS_SCRIPT -d"
|
||||
run_script_remote $NAS_IP "$NAS_SCRIPT --dx"
|
||||
|
||||
# alte Logs löschen (nur auf einem Server ausführen)
|
||||
prune_logs
|
||||
@@ -512,6 +512,10 @@ backup_daily() {
|
||||
nohup $THIS_SCRIPT -w >>$LOG_FILE 2>&1 </dev/null &
|
||||
fi
|
||||
|
||||
backup_daily
|
||||
}
|
||||
|
||||
backup_daily() {
|
||||
mail_log $INFO ">>>>>>>>>> daily auto backup $VER for $HOST_NAME <<<<<<<<<<"
|
||||
|
||||
do_auto_backup backup_daily
|
||||
@@ -642,7 +646,7 @@ list_archives() {
|
||||
local target=$1
|
||||
local targ=${NAS_ROOT//\//\\\/} # slashes escapen
|
||||
log $DEBUG "$DBG > find \"$NAS_ROOT\" -type f -name \"*.$EXT\" | sed -E \"s/^$targ//\""
|
||||
find "$NAS_ROOT" -type f -name "*.$EXT" 2>>$LOG_FILE | sed -E "s/^$targ//" 2>>$LOG_FILE
|
||||
find "$NAS_ROOT" -type f -name "*.$EXT" 2>>$LOG_FILE | sed -E "s/^$targ//" 2>>$LOG_FILE | sort
|
||||
check_pipe_rc ${PIPESTATUS[@]}
|
||||
return $?
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# entrypoint for all actions
|
||||
#
|
||||
|
||||
# 2.1.17 11.05.2025 - bugfixes, sort tar archive, split daily/cron daily
|
||||
# 2.1.16 10.05.2025 - fix mail.sh, log results of auto-update
|
||||
# 2.1.15 09.05.2025 - podman auto-update
|
||||
# 2.1.14 09.05.2025 - Fix mail.sh, homeserver.target, cleared all docker references
|
||||
@@ -15,7 +16,7 @@
|
||||
# 2.1.7 29.04.2025 - 1. Schritt zur Umstellung auf podman
|
||||
# 2.1.6 29.04.2025 - weekly backup Sa->SO
|
||||
|
||||
VER="2.1.16"
|
||||
VER="2.1.17"
|
||||
|
||||
HERE=$(dirname "$0")
|
||||
THIS_SCRIPT=$0
|
||||
@@ -69,6 +70,12 @@ while :; do
|
||||
show_help # Display a usage synopsis.
|
||||
exit 0
|
||||
;;
|
||||
--dx)
|
||||
MAIL_LOG_FILE="${log_file_name}.auto.log"
|
||||
check_root
|
||||
cron_backup_daily
|
||||
break
|
||||
;;
|
||||
-d|--daily)
|
||||
MAIL_LOG_FILE="${log_file_name}.auto.log"
|
||||
check_root
|
||||
|
||||
Reference in new issue
Block a user