From 912d4b94346514990ef4a19f2af8ce2886547d28 Mon Sep 17 00:00:00 2001
From: Hartmut Bauer <hb42@gmx.de>
Date: Mon, 5 May 2025 13:07:14 +0200
Subject: [PATCH] Fix DB-Dump

---
 main.inc.sh | 12 ++++++------
 main.sh     |  1 +
 nathan.sh   |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main.inc.sh b/main.inc.sh
index 6b7d6eb..fabec13 100755
--- a/main.inc.sh
+++ b/main.inc.sh
@@ -121,13 +121,13 @@ dump_postgresql() {
     check_directory $dump_dir
     
     # users and roles
-    log $DEBUG "$DBG > \$CONTAINER_EXEC_USER exec -u=postgres $pg_container pg_dumpall --globals-only"
-    $CONTAINER_EXEC_USER exec -u=postgres $pg_container 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 \$CONTAINER_EXEC_USER exec -u=postgres $pg_container psql -t -c \"select datname from pg_database where not datistemplate\""
-    for db in $($CONTAINER_EXEC_USER exec -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 exec -u=postgres $pg_container pg_dump --create $db"
-        $CONTAINER_EXEC_USER exec -u=postgres $pg_container 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
diff --git a/main.sh b/main.sh
index 597db62..aeb7039 100755
--- a/main.sh
+++ b/main.sh
@@ -3,6 +3,7 @@
 # entrypoint for all actions
 #
 
+# 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
diff --git a/nathan.sh b/nathan.sh
index 4a942d8..516bb3a 100755
--- a/nathan.sh
+++ b/nathan.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-USER_CONTAINERS="homeassistant-pod codeserver jellyfin pgadmin nextcloud-pod calibre nexus git-pod caddy"
+USER_CONTAINERS="homeassistant-pod codeserver jellyfin pgadmin nextcloud-pod calibre nexus git-pod caddy.socket caddy"
 ROOT_CONTAINERS=
 
 DOCKER_ROOT=/var/docker
@@ -27,9 +27,9 @@ before_backup() {
     let local rc=0
     #dump_mariadb $DOCKER_ROOT/dump/mysql
     #let rc=rc+$?
-    dump_postgresql postgres $DOCKER_ROOT/dump/postgres
+    dump_postgresql ncd_pg $DOCKER_ROOT/dump/nextcloud
     let rc=rc+$?
-    dump_postgresql pg_nextcloud $DOCKER_ROOT/dump/pg_nextcloud
+    dump_postgresql gitea_pg $DOCKER_ROOT/dump/gitea
     let rc=rc+$?
     if [ $rc -gt 0 ]; then
         return 1