Fix DB-Dump

build.sh

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

calvados.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/eval bash
 
-#NAS_ROOT=/Users/hb/mnt/nas/backups
+# nothing to do

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,7 +1,8 @@
 #!/usr/bin/eval bash
 
+USER_CONTAINERS=
+ROOT_CONTAINERS="pihole"
 
-#NAS_ROOT=/var/srv/nas/backups
 BACKUP_TARGET=/var/docker/tmp
 NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY"
 
@@ -16,17 +17,15 @@ backup_daily2() {
 
 
 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+$?
+    return $rc
 }

main.inc.sh

@@ -1,12 +1,14 @@
 HOST_NAME=$(hostname -s)
-DAY=$(date +%u) # MO == 1
+DAY=$(date +%u) # 1-7, MO is 1
+WEEKLY_DAY=7 # SA->SO
 
 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
 
 RESTORE_PATH="$NAS_MOUNT_POINT/Server/restore"
 
@@ -16,14 +18,16 @@ 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"
 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
@@ -80,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."
@@ -94,6 +99,7 @@ prune_logs() {
 # ----- db dump -----
 
 dump_mariadb() {
+    return 0
     log $DEBUG "$DBG dump_mariadb( $@ )"
     local dump_dir=$1
     local mysqlconnect="--user=root --password=snafu"
@@ -108,17 +114,20 @@ dump_mariadb() {
 }
 
 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
@@ -139,18 +148,51 @@ check_root() {
     fi
 }
 
-start_docker() {
-    log $DEBUG "$DBG start_docker()"
+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
-    return $?
+      let rc=rc+$?
+    fi
+    if [ -d /var/containers ]; then
+        do_start_stop_containers start
+        let rc=rc+$?
+    fi
+    return $rc
 }
 
-stop_docker() {
-    log $DEBUG "$DBG stop_docker()"
+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
-    return $?
+      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
 }
 
 # Zugriffsrechte für Logs und Backups setzen
@@ -158,10 +200,10 @@ stop_docker() {
 fix_acls() {
     log $DEBUG "$DBG fix_acls()"
 
-    log $DEBUG "$DBG chmod -R a+r $NAS_ROOT"
+    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 $LLOG_FILE_PATH"
-    chmod -R a+r $LLOG_FILE_PATH >>$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
@@ -395,7 +437,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
@@ -442,6 +484,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
@@ -455,11 +504,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 </dev/null &
-    fi
 }
 backup_weekly() {
     mail_log $INFO ">>>>>>>>>> weekly auto backup $VER for $HOST_NAME <<<<<<<<<<"
@@ -512,7 +556,7 @@ restore() {
     echo "--- files:   $@"
     echo "--- to:      $RESTORE_PATH"    
     echo
-    echo "Restore runs on NAS, see e-mail"
+    echo "Restore started on NAS, see e-mail"
     echo
     run_script_remote $NAS_IP "$NAS_SCRIPT --rx $archive $@"
 }
@@ -851,8 +895,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,7 +3,14 @@
 # entrypoint for all actions
 #
 
-VER="2.1.2"
+# 2.111   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
+
+VER="2.1.10"
 
 HERE=$(dirname "$0")
 THIS_SCRIPT=$0
@@ -83,7 +90,9 @@ while :; do
             if [ "$2" ]; then
                 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
             ;;
@@ -93,7 +102,9 @@ while :; do
                 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
             ;;

nathan.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-#NAS_ROOT=/var/srv/nas/backups
+USER_CONTAINERS="homeassistant-pod codeserver jellyfin pgadmin nextcloud-pod calibre nexus git-pod caddy.socket caddy"
+ROOT_CONTAINERS=
+
 DOCKER_ROOT=/var/docker
 BACKUP_TARGET=$DOCKER_ROOT/tmp
 NAS_TARGET="$NAS_ROOT/daily/$HOST_NAME/backup.$DAY"
@@ -22,24 +24,25 @@ backup_daily3() {
 
 
 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 $DOCKER_ROOT/dump/nextcloud
+    let rc=rc+$?
+    dump_postgresql gitea_pg $DOCKER_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+$?
+    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,104 +0,0 @@
-#!/usr/bin/env bash
-
-fn() {
-    echo "all: $@"
-    echo "#1: $1"
-    shift
-    echo "rest: $@"
-}
-
-
-fn eins zwei drei
-exit
-
-
-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