all docker references cleared, fixes

build.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
 cp -v *.sh ../../bin/backup
+cp -v save-conf ../../bin

calvados.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/eval bash
+
+# nothing to do

check.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# check if container services are running
+
+UNITS="/var/containers/systemd"
+FAILED=""
+
+check_service() {
+    local service=$1
+
+    systemctl is-active --user --machine=container@ $service >/dev/null
+    if [ $? -ne 0 ]; then
+        FAILED="$FAILED $service"
+    fi
+}
+
+check() {
+    local type=$1
+    for i in $UNITS/$type/*.socket; do
+        check_service $(basename $i)
+    done
+
+    for i in $UNITS/$type/*.container; do
+        check_service $(basename $i .container).service 
+    done
+}
+
+check user
+check system
+
+if [ -z "$FAILED" ]; then
+    echo "OK  All services are running"
+    exit 0
+else
+    echo "#" >&2
+    echo "# ERROR  some services are not running:" >&2
+    echo "#" >&2
+    echo "#       $FAILED" >&2
+    echo "#" >&2
+    exit 1
+fi

dump_oracle.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# falls das nochmal gebraucht wird
+
+HERE=$(dirname $0)
+DOCKER=/usr/bin/docker
+
+ORACLEDUMP="$DOCKER exec -i oracle /opt/oracle/product/18c/dbhomeXE/bin/expdp"
+ORACLECONNECT="sbsdb_master/sbsdbpwd@//localhost:1521/xepdb1"
+ORACLEDATAPUMP=/var/docker/vol/oracle/dump
+
+function dump_oracle() {
+  mkdir -p $HERE/oracle > /dev/null 2>&1
+  echo "$(date) - Oracle dump"
+  $ORACLEDUMP $ORACLECONNECT dumpfile=sbsdb_dump:sbsdb.dmp logfile=sbsdb_dump:sbsdb.log reuse_dumpfiles=yes
+  mv $ORACLEDATAPUMP/* $HERE/oracle
+}
+
+dump_oracle

hamiller.sh

@@ -1,32 +1,33 @@
 #!/usr/bin/eval bash
 
+USER_CONTAINERS=
+ROOT_CONTAINERS="pihole"
 
-NAS_ROOT=/var/srv/nas/backups
-BACKUP_TARGET=/var/docker/tmp
+BACKUP_TARGET=/var/containers/tmp
 NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY"
 
 backup_daily1() {
     BACKUP_SOURCE="/var"
-    BACKUP_EXCLUDE_DIRS=(docker)
+    BACKUP_EXCLUDE_DIRS=(containers)
 }
 backup_daily2() {
-    BACKUP_SOURCE="/var/docker"
+    BACKUP_SOURCE="/var/containers"
     BACKUP_EXCLUDE_DIRS=(tmp)
 }
 
 
 before_backup() {
-    stop_docker
+    stop_containers
     return $?
 }
 
 after_backup() {
-    start_docker
-    local dock=$?
+    let local rc=0
+    start_containers
+    let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
-    local copy=$?
-    if [ $dock -eq 0 ] && [ $copy -eq 0 ]; then
-        return 0
-    fi
-    return 1
+    let rc=rc+$?
+    check_services
+    let rc=rc+$?
+    return $rc
 }

mail.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Mail via GMX-Relay versenden (Docker-Image "hb42/smtp")
+# Mail via GMX-Relay versenden (Podman-Image "smtp-relay")
 #
 # Klappt nur direkt im Container, daher ggf. via ssh aufrufen (Annahme: remote user == local user)
 #
@@ -12,10 +12,12 @@
 # > mail.sh hb242@pm.me "log whatever" ../log/some.log
 #
 
-DOCKER=/usr/bin/docker
-MAILCONTAINER=smtp
+PODMAN=/usr/bin/podman
+SUDO="sudo -u container sh -c"
+MAILCONTAINER=smtp-relay
 MAILSERVER_IP=10.4.2.30
-SSH=""
+REMOTE=""
+
 
 which ip >/dev/null 2>&1
 if [ $? -eq 0 ]; then
@@ -27,7 +29,7 @@ else
 fi
 
 if [ "$myip" != "$MAILSERVER_IP" ]; then
-    SSH="ssh $MAILSERVER_IP"
+    REMOTE=yes
 fi
 
 TO=$1
@@ -44,8 +46,12 @@ fi
 # Mail body aus Datei oder STDIN holen
 CONTENT=$(cat ${1:--})
 
+MAILCMD="$SUDO $PODMAN exec -i $MAILCONTAINER /usr/sbin/sendmail -i -t"
+if [ ! -z "$REMOTE" ]; then
+    MAILCMD="ssh $MAILSERVER_IP \"$MAILCMD\""
+fi
 # construct mail header + content and pipe to sendmail
-cat <<EOMB | $SSH $DOCKER exec -i $MAILCONTAINER /usr/sbin/sendmail -i -t
+cat <<EOMB | $MAILCMD
 FROM: hb42@gmx.de
 TO: ${TO}
 DATE: $(date -R)

main.inc.sh

@@ -1,20 +1,33 @@
 HOST_NAME=$(hostname -s)
-DAY=$(date +%u) # MO == 1
+DAY=$(date +%u) # 1-7, MO is 1
+WEEKLY_DAY=7 # SA->SO
 
-BACKUP_MASTER_CHECK="/var/docker/vol/proxy"
+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%S')"
+LOG_FILE="${log_file_name}.log"
+LOG_KEEP_DAYS=14
+
+RESTORE_PATH="$NAS_MOUNT_POINT/Server/restore"
+
+BACKUP_MASTER_CHECK="/var/containers/vol/caddy"
 
 NAS_HOSTNAME=synology
 NAS_IP=10.4.2.20
 NAS_SCRIPT=/volume1/nfs/Server/bin/backup/main.sh
 
-WEEKLY_DAY=1 # SO->MO
-
 PASSPHRASE=L1rfCXu8PHMQsGL0HJWwzQYpCT7f5VboislOTHMaEV
 EXT=tgz.gpg
-LIST_EXT=txt
+LIST_EXT=list
 
-DOCKER="/usr/bin/docker compose -f /var/docker/run/docker-compose.yml --ansi never"
+#DOCKER="/usr/bin/docker compose -f /var/docker/run/docker-compose.yml --ansi never"
 SYNO_USB=/usr/syno/bin/synousbdisk
+SYSTEMCTL_USER="/usr/bin/systemctl --user --machine=container@"
+SYSTEMCTL="/usr/bin/systemctl"
+CONTAINER_EXEC_USER=" sudo -u container podman exec"
+CONTAINER_EXEC="podman exec"
 
 LOG_RECIPIENT=hb242@pm.me
 INFO=INFO
@@ -71,11 +84,12 @@ send_mail_log() {
 
 # Alte Logs löschen
 #
+# Dateien älter als $LOG_KEEP_DAYS Tage löschen
+#
 prune_logs() {
     log $DEBUG "$DBG prune_logs()"
-    # Dateien älter als 14 Tage löschen
-    log $DEBUG "$DBG > find \"$LOG_FILE_PATH\" -type f -mtime +14 -delete"
-    find "$LOG_FILE_PATH" -type f -mtime +14 -delete >>$LOG_FILE 2>&1
+    log $DEBUG "$DBG > find \"$LOG_FILE_PATH\" -type f -mtime +$LOG_KEEP_DAYS -delete"
+    find "$LOG_FILE_PATH" -type f -mtime +$LOG_KEEP_DAYS -delete >>$LOG_FILE 2>&1
     if [ $? -ne 0 ]; then
         # Fehler nur protokollieren, kein Grund abzubrechen
         mail_log $ERROR "$ERR error deleting old log files."
@@ -84,32 +98,36 @@ prune_logs() {
 
 # ----- db dump -----
 
-dump_mariadb() {
-    log $DEBUG "$DBG dump_mariadb( $@ )"
-    local dump_dir=$1
-    local mysqlconnect="--user=root --password=snafu"
-
-    log $DEBUG "$DBG > \$DOCKER exec mysql /usr/bin/mariadb --silent --user=xxx --password=xxx -e \"show databases\" -B"
-    for db in $($DOCKER exec mysql /usr/bin/mariadb --silent $mysqlconnect -e "show databases" -B 2>>$LOG_FILE | grep -v information_schema 2>>$LOG_FILE | grep -v performance_schema 2>>$LOG_FILE | sed -e 's/\r//' 2>>$LOG_FILE); do
-        log $DEBUG "$DBG   > \$DOCKER exec mysql /usr/bin/mariadb-dump --hex-blob --user=xxx --password=xxx --databases $db"
-        $DOCKER exec mysql /usr/bin/mariadb-dump --hex-blob $mysqlconnect --databases $db >$dump_dir/$db.sql 2>>$LOG_FILE
-        is_error $? false && return 1
-    done
-    return 0
-}
+#dump_mariadb() {
+#    return 0
+#    log $DEBUG "$DBG dump_mariadb( $@ )"
+#    local dump_dir=$1
+#    local mysqlconnect="--user=root --password=snafu"
+#
+#    log $DEBUG "$DBG > \$DOCKER exec mysql /usr/bin/mariadb --silent --user=xxx --password=xxx -e \"show databases\" -B"
+#    for db in $($DOCKER exec mysql /usr/bin/mariadb --silent $mysqlconnect -e "show databases" -B 2>>$LOG_FILE | grep -v information_schema 2>>$LOG_FILE | grep -v performance_schema 2>>$LOG_FILE | sed -e 's/\r//' 2>>$LOG_FILE); do
+#        log $DEBUG "$DBG   > \$DOCKER exec mysql /usr/bin/mariadb-dump --hex-blob --user=xxx --password=xxx --databases $db"
+#        $DOCKER exec mysql /usr/bin/mariadb-dump --hex-blob $mysqlconnect --databases $db >$dump_dir/$db.sql 2>>$LOG_FILE
+#        is_error $? false && return 1
+#    done
+#    return 0
+#}
 
 dump_postgresql() {
+    local pg_container=$1
+    local dump_dir=$2
     log $DEBUG "$DBG dump_postgresql( $@ )"
-    local dump_dir=$1
+    delete_dir $dump_dir
+    check_directory $dump_dir
     
     # users and roles
-    log $DEBUG "$DBG > \$DOCKER exec -u=postgres postgres pg_dumpall --globals-only"
-    $DOCKER exec -u=postgres postgres pg_dumpall --globals-only > $dump_dir/_globals.sql 2>>$LOG_FILE
+    log $DEBUG "$DBG > \$CONTAINER_EXEC_USER -u=postgres $pg_container pg_dumpall --globals-only"
+    $CONTAINER_EXEC_USER -u=postgres $pg_container pg_dumpall --globals-only > $dump_dir/_globals.sql 2>>$LOG_FILE
 
-    log $DEBUG "$DBG \$DOCKER exec -u=postgres postgres psql -t -c \"select datname from pg_database where not datistemplate\""
-    for db in $($DOCKER exec -u=postgres postgres psql -t -c "select datname from pg_database where not datistemplate" 2>>$LOG_FILE); do 
-        log $DEBUG "$DBG   > \$DOCKER exec -u=postgres postgres pg_dump --create $db"
-        $DOCKER exec -u=postgres postgres pg_dump --create $db > $dump_dir/$db.sql 2>>$LOG_FILE
+    log $DEBUG "$DBG \$CONTAINER_EXEC_USER -u=postgres $pg_container psql -t -c \"select datname from pg_database where not datistemplate\""
+    for db in $($CONTAINER_EXEC_USER -u=postgres $pg_container psql -t -c "select datname from pg_database where not datistemplate" 2>>$LOG_FILE); do 
+        log $DEBUG "$DBG   > \$CONTAINER_EXEC_USER -u=postgres $pg_container pg_dump --create $db"
+        $CONTAINER_EXEC_USER -u=postgres $pg_container pg_dump --create $db > $dump_dir/$db.sql 2>>$LOG_FILE
         is_error $? false && return 1
     done
     return 0
@@ -117,18 +135,81 @@ dump_postgresql() {
 
 # ----- helper functions -----
 
-start_docker() {
-    log $DEBUG "$DBG start_docker()"
-    log $DEBUG "$DBG > \$DOCKER up -d"
-    $DOCKER up -d >>$LOG_FILE 2>&1
+# Für Backup und Export muss das Script mit root-Rechten
+# ausgeführt werden.
+# 
+check_root() {
+    if [ "$(id -u)" -ne 0 ]; then
+        log $ERROR "$ERR script must be run as superuser."
+        echo "****"
+        echo "***** script must be run as superuser! *****"
+        echo "****"
+        exit 100
+    fi
+}
+
+start_containers() {
+    local let rc=0 
+    log $DEBUG "$DBG start_containers()"
+#    if [ -f /var/docker/run/docker-compose.yml ]; then
+#      log $DEBUG "$DBG > \$DOCKER up -d"
+#      $DOCKER up -d >>$LOG_FILE 2>&1
+#      let rc=rc+$?
+#    fi
+    if [ -d /var/containers ]; then
+        do_start_stop_containers start
+        let rc=rc+$?
+    fi
+    return $rc
+}
+
+stop_containers() {
+    local let rc=0
+    log $DEBUG "$DBG stop_containers()"
+#    if [ -f /var/docker/run/docker-compose.yml ]; then
+#      log $DEBUG "$DBG > \$DOCKER down"
+#      $DOCKER down >>$LOG_FILE 2>&1
+#      let rc=rc+$?
+#    fi
+    if [ -d /var/containers ]; then
+        do_start_stop_containers stop
+        let rc=rc+$?
+    fi
+    return $rc
+}
+
+do_start_stop_containers() {
+    local cmd=$1
+    local let rc=0
+    log $DEBUG "$DBG do_start_stop_containers() $cmd"
+    if [ ! -z "$ROOT_CONTAINERS" ]; then
+        log $DEBUG "$DBG > $SYSTEMCTL $cmd $ROOT_CONTAINERS"
+        $SYSTEMCTL $cmd $ROOT_CONTAINERS >>$LOG_FILE 2>&1 
+        let rc=rc+$?
+    fi
+    if [ ! -z "$USER_CONTAINERS" ]; then
+        log $DEBUG "$DBG > $SYSTEMCTL_USER $cmd $USER_CONTAINERS"
+        $SYSTEMCTL_USER $cmd $USER_CONTAINERS >>$LOG_FILE 2>&1 
+        let rc=rc+$?
+    fi      
+    return $rc
+}
+
+check_services() {
+    log $DEBUG "$DBG check_services()"
+    $HERE/check.sh >>$LOG_FILE 2>&1
     return $?
 }
 
-stop_docker() {
-    log $DEBUG "$DBG stop_docker()"
-    log $DEBUG "$DBG > \$DOCKER down"
-    $DOCKER down >>$LOG_FILE 2>&1
-    return $?
+# Zugriffsrechte für Logs und Backups setzen
+#
+fix_acls() {
+    log $DEBUG "$DBG fix_acls()"
+
+    log $DEBUG "$DBG > chmod -R a+r $NAS_ROOT"
+    chmod -R a+r $NAS_ROOT >>$LOG_FILE 2>&1
+    log $DEBUG "$DBG > chmod -R a+r $LOG_FILE_PATH"
+    chmod -R a+r $LOG_FILE_PATH >>$LOG_FILE 2>&1
 }
 
 # Script per ssh auf Server $1 im Hintergrund starten
@@ -362,7 +443,7 @@ do_auto_backup() {
     local rc
     
     if ! $func$count 2>/dev/null ; then  # Seiteneffekt: $func$count wird ausgeführt
-        mail_log $ERROR "$ERR keine Backup-Function $func$count() für $HOST_NAME."
+        log $ERROR "$ERR keine Backup-Function $func$count() für $HOST_NAME."
         exit 1 # kein Mail-Benachrichtigung!
     fi
     set_log_info
@@ -409,6 +490,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 </dev/null &
+    fi
+
     mail_log $INFO ">>>>>>>>>> daily auto backup $VER for $HOST_NAME <<<<<<<<<<"
 
     do_auto_backup backup_daily
@@ -419,13 +507,9 @@ backup_daily() {
     is_error $?
 
     mail_log $INFO ">>>>>>>>>> end of auto backup"
+    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 </dev/null &
-    fi
 }
 backup_weekly() {
     mail_log $INFO ">>>>>>>>>> weekly auto backup $VER for $HOST_NAME <<<<<<<<<<"
@@ -437,6 +521,7 @@ backup_weekly() {
     is_error $?
 
     mail_log $INFO ">>>>>>>>>> end of auto backup"
+    fix_acls
     send_mail_log "Weekly Backup"
 }
 
@@ -462,21 +547,50 @@ test_integrity() {
 
 # Restore aus Archiv
 #
-# Wird nach pwd ausgegeben!
+# Wird nach $RESTORE_PATH ausgegeben und mit root-Rechten 
+# auf der NAS ausgeführt.
 #
-# $1 - Archiv, ggf. mit Pfad
+# $1 - Archiv, mit Pfad ab $NAS_ROOT
 # $2 ff. - zurückzusichernde Dateien/Verzeichnisse
 #
-# returns 0 for success, 1 otherwise
-#
 restore() {
     log $DEBUG "$DBG restore( $@ )"
     local archive=$1
-    shift 1
-    log $DEBUG "$DBG > gpg --batch --decrypt --passphrase xxxx \"$archive\" | tar -xzv $@"
-    gpg --batch --decrypt --passphrase $PASSPHRASE "$archive" 2>>$LOG_FILE | tar -xzv $@ >/dev/null 2>>$LOG_FILE
+    shift
+    echo "--- Restore ---"
+    echo "--- archive: $archive"
+    echo "--- files:   $@"
+    echo "--- to:      $RESTORE_PATH"    
+    echo
+    echo "Restore started on NAS, see e-mail"
+    echo
+    run_script_remote $NAS_IP "$NAS_SCRIPT --rx $archive $@"
+}
+
+# Restore 
+#
+# Beim Restore einzelner Dateien wird nur die ownership der Datei
+# restored, nicht die des Pfades zur Datei!
+#
+do_restore() {
+    if [ "$HOST_NAME" != "$NAS_HOSTNAME" ]; then
+        restore $@
+        exit
+    fi
+
+    local archive=$1
+    shift
+    mail_log $INFO ">>>>>>>>>> restore $VER for $HOST_NAME <<<<<<<<<<"
+    mail_log $INFO ">>> restore from: $archive"
+    mail_log $INFO ">>> files       : $@" 
+    mail_log $INFO ">>> restore to  : $RESTORE_PATH"
+    mail_log $INFO ">>> log file    : $LOG_FILE"
+    log $DEBUG "$DBG > gpg --batch --decrypt --passphrase xxxx \"$NAS_ROOT/${archive/#\//}\" | tar -xzv --directory $RESTORE_PATH $@"
+    gpg --batch --decrypt --passphrase $PASSPHRASE "$NAS_ROOT/${archive/#\//}" 2>>$LOG_FILE | tar -xzv --directory $RESTORE_PATH $@ >>$LOG_FILE 2>&1
     check_pipe_rc ${PIPESTATUS[@]}
-    return $?
+    is_error $?
+    mail_log $INFO ">>>>>>>>>> end of restore"
+    send_mail_log "Restore"   
 }
 
 # ----- archive content ------
@@ -498,41 +612,37 @@ create_list() {
 
 # Liste der Archives auf stdout ausgeben
 #
-# Zeigt alle Archive incl. Verzeichnis (ohne $1) an
+# Zeigt alle Archive incl. Verzeichnis (ohne $NAS_ROOT) an
 #
 # z.B.
-#    $1 = /volume1/nfs/backups
+#    $NAS_ROOT = /volume1/nfs/backups
 #    ...
 #    /daily/synology/backup.3/volume1-nfs-Server.tgz.gpg
 #    /weekly/synology/volume1-media-books.tgz.gpg
 #
-# $1 - Verzeichnis unter dem alle Backups liegen
-#
 # returns 0 for success, 1 otherwise
 #
 list_archives() {
-    log $DEBUG "$DBG list_archives( $@ )"
+    log $DEBUG "$DBG list_archives()"
     local target=$1
-    local targ=${target//\//\\\/} # slashes escapen
-    log $DEBUG "$DBG > find \"$target\" -type f -name \"*.$EXT\" | grep \"${HOST_NAME}/\" | sed -E \"s/^$targ//\""
-    find "$target" -type f -name "*.$EXT" 2>>$LOG_FILE | grep "${HOST_NAME}/" 2>>$LOG_FILE | sed -E "s/^$targ//" 2>>$LOG_FILE
+    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
     check_pipe_rc ${PIPESTATUS[@]}
     return $?
 }
 
-# Inhalt des Archivs $2 auf stdout ausgeben
+# Inhalt des Archivs $1 auf stdout ausgeben
 #
-# $1 - Verzeichnis unter dem alle Backups liegen
-# $2 - Archiv-Datei mit Pfad ab $1
+# $1 - Archiv-Datei mit Pfad ab $NAS_ROOT
 #
 # returns 0 for success, 1 otherwise
 #
 list_archive_content() {
     log $DEBUG "$DBG list_archive_content( $@ )"
-    local root=$1
-    local archive=$2
-    log $DEBUG "$DBG > cat \"$root/${archive/#\//}.$LIST_EXT\""
-    cat "$root/${archive/#\//}.$LIST_EXT" 2>>$LOG_FILE
+    local archive=$1
+    log $DEBUG "$DBG > cat \"$NAS_ROOT/${archive/#\//}.$LIST_EXT\""
+    cat "$NAS_ROOT/${archive/#\//}.$LIST_EXT" 2>>$LOG_FILE
 }
 
 # ----- export -----
@@ -791,8 +901,8 @@ do_export() {
     mail_log $INFO ">>> " 
 
     mail_log $INFO "$INF exporting $source_path -> $mount_point"
-    log $DEBUG "$DBG rsync -rti --one-file-system --delete --stats --exclude=@eaDir $source_path $mount_point"
-    rsync -rti --one-file-system --delete --stats --exclude=@eaDir $source_path $mount_point >>$LOG_FILE 2>&1
+    log $DEBUG "$DBG rsync -rti --one-file-system --delete --stats --exclude=@eaDir --exclude='*'.$LIST_EXT $source_path $mount_point"
+    rsync -rti --one-file-system --delete --stats --exclude=@eaDir --exclude='*'.$LIST_EXT $source_path $mount_point >>$LOG_FILE 2>&1
     is_error $?
 
     mail_log $INFO "$INF unmounting USB device $device."

main.sh

@@ -3,37 +3,38 @@
 # entrypoint for all actions
 #
 
-VER="2.1.0"
+# 2.1.14  09.05.2025 - Fix mail.sh, homeserver.target, cleared all docker references
+# 2.1.13  08.05.2025 - check if services are running after backup
+# 2.1.12  08.05.2025 - mail.sh an neuen Container angepasst
+# 2.1.11  05.05.2025 - Fix DB-Dump
+# 2.1.10  05.05.2025 - Postgres-Dump auf podman umgestellt
+# 2.1.9   02.05.2025 - DB-Dump erweitert, damit Dumps für mehrere postgres möglich sind
+# 2.1.8   30.04.2025 - systemctl start/stop eingebaut
+# 2.1.7   29.04.2025 - 1. Schritt zur Umstellung auf podman
+# 2.1.6   29.04.2025 - weekly backup Sa->SO
 
-show_help() {
-    echo "usage: $0 options"
-    echo "       -d, --daily     start daily backup on local machine"
-    echo "       -w, --weekly    start weekly backup on local machine"
-    echo "       --list          list archives" 
-    echo '       --content <archive> '
-    echo "                       show contents of archive"
-    echo '       -r, --restore <archive> <file(s)> ' 
-    echo "                       restore files from archive to pwd"
-    echo "       -h, -?. --help  show this help"
-    echo " "
-    echo " Script muss auf dem jeweiligen Server ausgeführt werden (ggf. via ssh)."
-    echo " "
-}
-
-#
-# Script muss unter root bzw. sudo laufen, sonst gibt es jede Menge Probleme
-# mit Zugriff auf die diversen Verzeichnisse.
-# 
-if [ "$(id -u)" -ne 0 ]; then
-    echo "**"
-    echo "** ERROR: script has to be run as superuser!"
-    echo "**"
-    exit 100
-fi
+VER="2.1.13"
 
 HERE=$(dirname "$0")
 THIS_SCRIPT=$0
 
+show_help() {
+    echo "Server Backup $VER"
+    echo "usage: $0 options"
+    echo "       -d, --daily     start daily backup on local machine"
+    echo "       -w, --weekly    start weekly backup on local machine"
+    echo "       -e, --export    export backups to USB-HDD"
+    echo "       -l, --list      list archives" 
+    echo '       -c, --content <archive> '
+    echo "                       show contents of archive (path from $NAS_ROOT)"
+    echo '       -r, --restore <archive> <file(s)> ' 
+    echo "                       restore files from archive to $RESTORE_PATH"
+    echo "       -h, -?. --help  show this help"
+    echo " "
+    echo " -d, -w, -e must be run as superuser."
+    echo " "
+}
+
 if [ -f $HERE/main.inc.sh ]; then
     . $HERE/main.inc.sh
 else
@@ -56,9 +57,6 @@ else
     exit 102
 fi
 
-LOG_FILE_PATH="$(realpath $HERE/../../../log/backup)"
-log_file_name="$LOG_FILE_PATH/$HOST_NAME-$(date '+%Y-%m-%d_%H%M')"
-LOG_FILE="${log_file_name}.log"
 
 file=
 archive=
@@ -71,44 +69,55 @@ while :; do
             ;;
         -d|--daily) 
             MAIL_LOG_FILE="${log_file_name}.auto.log"
+            check_root
             backup_daily 
             break 
             ;;
         -w|--weekly) 
             MAIL_LOG_FILE="${log_file_name}.auto.log"
+            check_root
             backup_weekly
             break 
             ;;
         -e|--export) 
             MAIL_LOG_FILE="${log_file_name}.auto.log"
+            check_root
             export_backups
             break 
             ;;
-        --list)
-            list_archives "$NAS_ROOT/daily/$HOST_NAME"
-            if [ -d "$NAS_ROOT/weekly/$HOST_NAME" ]; then
-                list_archives "$NAS_ROOT/weekly/$HOST_NAME"
-            fi
+        -l|--list)
+            list_archives
             break;
             ;;
-        --content)
+        -c|--content)
             if [ "$2" ]; then
-                list_archive_content "$NAS_ROOT" "$2"
+                list_archive_content "$2"
             else
-                echo 'ERROR: "--content" requires a non-empty option argument.'
+                echo 'ERROR: "--content" requires the archive name as an argument.'
+                echo
+                show_help
             fi
             break
             ;;
         -r|--restore)
             if [ "$2" ]; then
                 archive=$2
-                shift
+                shift 2
                 restore "$archive" "$@"
             else
-                echo 'ERROR: "--restore" requires a non-empty option argument.'
+                echo 'ERROR: "--restore" requires at least the archive name as an argument.'
+                echo
+                show_help
             fi
             break
             ;;
+        --rx)
+            MAIL_LOG_FILE="${log_file_name}.auto.log"
+            check_root
+            shift
+            do_restore $@
+            break
+            ;;
         --)              # End of all options.
             shift
             break

nathan.sh

@@ -1,45 +1,51 @@
 #!/usr/bin/env bash
 
-NAS_ROOT=/var/srv/nas/backups
-DOCKER_ROOT=/var/docker
-BACKUP_TARGET=$DOCKER_ROOT/tmp
+USER_CONTAINERS="homeserver.target"
+ROOT_CONTAINERS=
+
+#DOCKER_ROOT=/var/docker
+CONTAINERS_ROOT=/var/containers
+BACKUP_TARGET=$CONTAINERS_ROOT/tmp
 NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY"
 
 backup_daily1() {
     BACKUP_SOURCE="/var"
-    BACKUP_EXCLUDE_DIRS=(docker)
+    BACKUP_EXCLUDE_DIRS=(containers)
 }
 
 backup_daily2() {
-    BACKUP_SOURCE="/var/docker"
+    BACKUP_SOURCE="/var/containers"
     BACKUP_EXCLUDE_DIRS=(vol tmp)
 }
 
 backup_daily3() {
-    BACKUP_SOURCE="/var/docker/vol"
+    BACKUP_SOURCE="/var/containers/vol"
     BACKUP_EXCLUDE_DIRS=()
 }
 
 
 before_backup() {
-    dump_mariadb $DOCKER_ROOT/dump/mysql
-    local mys=$?
-    dump_postgresql $DOCKER_ROOT/dump/postgresql
-    local pos=$?
-    if [ $mys -gt 0 ] || [ $pos -gt 0 ]; then
+    let local rc=0
+    #dump_mariadb $DOCKER_ROOT/dump/mysql
+    #let rc=rc+$?
+    dump_postgresql ncd_pg $CONTAINERS_ROOT/dump/nextcloud
+    let rc=rc+$?
+    dump_postgresql gitea_pg $CONTAINERS_ROOT/dump/gitea
+    let rc=rc+$?
+    if [ $rc -gt 0 ]; then
         return 1
     fi
-    stop_docker
+    stop_containers
     return $?
 }
 
 after_backup() {
-    start_docker
-    local dock=$?
+    let local rc=0
+    start_containers
+    let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
-    local copy=$?
-    if [ $dock -eq 0 ] && [ $copy -eq 0 ]; then
-        return 0
-    fi
-    return 1
+    let rc=rc+$?
+    check_services
+    let rc=rc+$?
+    return $rc
 }

save-conf

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+#
+# Archive docker config
+#
+# copy this file to docker/run
+
+SOURCE=/var/docker/run/docker-compose.yml
+SAVE_DIR=/srv/nas/Server/CoreOS/docker-run
+SAVE_FILE=$(hostname -s)-docker-compose-$(date '+%Y-%m-%d_%H%M').yml
+
+cp $SOURCE $SAVE_DIR/$SAVE_FILE

synology.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/eval bash
 
-NAS_ROOT=/volume1/nfs/backups
 HAS_WEEKLY=true
 
 backup_daily1() {

test.sh

@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$(id -u)" -ne 0 ]; then
-    echo "**"
-    echo "** ERROR: script has to be run as superuser!"
-    echo "**"
-    exit 100
-fi
-
-HERE=$(dirname "$0")
-
-if [ -f $HERE/main.inc.sh ]; then
-    . $HERE/main.inc.sh
-else
-    echo "**"
-    echo "** ERROR: Datei \"$HERE/main.inc.sh\" nicht gefunden. "
-    echo "**        Script wird abgebrochen"
-    echo "**"
-    show_help
-    exit 101
-fi
-
-if [ -f $HERE/$HOST_NAME.sh ]; then
-    . $HERE/$HOST_NAME.sh
-else
-    echo "**"
-    echo "** ERROR: Datei \"$HOST_NAME.sh\" nicht gefunden (falscher Rechner?). "
-    echo "**        Script wird abgebrochen."
-    echo "**"
-    show_help
-    exit 102
-fi
-
-log_file_name="$NAS_ROOT/log/$HOST_NAME-$(date '+%Y-%m-%d_%H%M')"
-LOG_FILE="${log_file_name}.log"
-
-# nicht auf calvados
-#. $HERE/$HOST_NAME
-
-test() {
-    for i in "$@"; do echo "$i"; done 
-}
-
-isFunction() { declare -Ff "$1" ; }
-
-if [ "$HOST_NAME" != "$NAS_HOSTNAME" ]; then
-    run_script_remote $NAS_IP "/volume1/nfs/Server/bin/backup/test.sh -x"
-        #ssh 10.4.2.20 "sudo sh -c 'nohup /volume1/nfs/Server/bin/backup/main.sh -e &>/dev/null < /dev/null &'"
-    exit
-else
-    echo "klappt $1" > /volume1/nfs/log/backup/remote_run.log
-fi
-
-
-exit
-
-
-list1() {
-    EXCL=("eaDir" "Temporary Items" "lost+found" backups)
-    ONE="erster #1"
-    TWO="zweiter #1"
-    #for i in "${a[@]}"; do echo "$i"; done
-}
-list2() {
-    EXCL=("@eaDir" "Temporary Items" "lost+found")
-    ONE="eins2"
-    TWO="zwei2"
-    return 0
-    #for i in "${a[@]}"; do echo "$i"; done
-}
-
-fun0() {
-    return 0
-}
-
-if [ "$(id -u)" -ne 0 ]; then
-    echo "**"
-    echo "** ERROR: script has to be run as superuser!"
-    echo "**"
-    exit 100
-fi
-
-fun0
-rc=$?
-
-if [ $rc -eq 0 ]; then
-    echo "$rc -eq 0"
-fi
-
-#echo "result=$rc0"
-
-exit