fix mail.sh, log results of auto update

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

hamiller.sh

@@ -3,15 +3,15 @@
 USER_CONTAINERS=
 ROOT_CONTAINERS="pihole"
 
-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)
 }
 
@@ -27,5 +27,7 @@ after_backup() {
     let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
     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,15 @@
 # > mail.sh hb242@pm.me "log whatever" ../log/some.log
 #
 
-DOCKER=/usr/bin/docker
-MAILCONTAINER=smtp
+PODMAN=/usr/bin/podman
+#
+# -i ist entscheident, damit die restliche Kommandozeile sauber ausgewertet wird
+#    das ersetzt den expliziten Aufruf mit "sh -c "..." "
+SUDO="sudo -u container -i"
+MAILCONTAINER=smtp-relay
 MAILSERVER_IP=10.4.2.30
-SSH=""
+REMOTE=""
+
 
 which ip >/dev/null 2>&1
 if [ $? -eq 0 ]; then
@@ -27,7 +32,7 @@ else
 fi
 
 if [ "$myip" != "$MAILSERVER_IP" ]; then
-    SSH="ssh $MAILSERVER_IP"
+    REMOTE=yes
 fi
 
 TO=$1
@@ -44,8 +49,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

@@ -12,7 +12,7 @@ LOG_KEEP_DAYS=14
 
 RESTORE_PATH="$NAS_MOUNT_POINT/Server/restore"
 
-BACKUP_MASTER_CHECK="/var/docker/vol/proxy"
+BACKUP_MASTER_CHECK="/var/containers/vol/caddy"
 
 NAS_HOSTNAME=synology
 NAS_IP=10.4.2.20
@@ -22,11 +22,13 @@ PASSPHRASE=L1rfCXu8PHMQsGL0HJWwzQYpCT7f5VboislOTHMaEV
 EXT=tgz.gpg
 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"
+PODMAN=" sudo -u container podman"
+CONTAINER_EXEC_USER=" $PODMAN exec"
+CONTAINER_SVC_UPDATE_USER=" $PODMAN auto-update"
 CONTAINER_EXEC="podman exec"
 
 LOG_RECIPIENT=hb242@pm.me
@@ -98,20 +100,20 @@ prune_logs() {
 
 # ----- db dump -----
 
-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_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
@@ -151,11 +153,11 @@ check_root() {
 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 [ -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+$?
@@ -166,11 +168,11 @@ start_containers() {
 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 [ -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+$?
@@ -195,6 +197,25 @@ do_start_stop_containers() {
     return $rc
 }
 
+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')
+    check_pipe_rc ${PIPESTATUS[@]}
+    local rc=$?
+    for i in $upd; do
+        mail_log $INFO "$INF      $i"
+    done
+    return $rc
+}
+
+check_services() {
+    log $DEBUG "$DBG check_services()"
+    mail_log $INFO "$INF    check services"
+    $HERE/check.sh >>$LOG_FILE 2>&1
+    return $?
+}
+
 # Zugriffsrechte für Logs und Backups setzen
 #
 fix_acls() {

main.sh

@@ -3,14 +3,19 @@
 # entrypoint for all actions
 #
 
-# 2.111   05.05.2025 - Fix DB-Dump
+# 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
+# 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
 
-VER="2.1.10"
+VER="2.1.16"
 
 HERE=$(dirname "$0")
 THIS_SCRIPT=$0

nathan.sh

@@ -1,24 +1,25 @@
 #!/usr/bin/env bash
 
-USER_CONTAINERS="homeassistant-pod codeserver jellyfin pgadmin nextcloud-pod calibre nexus git-pod caddy.socket caddy"
+USER_CONTAINERS="homeserver.target"
 ROOT_CONTAINERS=
 
-DOCKER_ROOT=/var/docker
-BACKUP_TARGET=$DOCKER_ROOT/tmp
+#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=()
 }
 
@@ -27,9 +28,9 @@ before_backup() {
     let local rc=0
     #dump_mariadb $DOCKER_ROOT/dump/mysql
     #let rc=rc+$?
-    dump_postgresql ncd_pg $DOCKER_ROOT/dump/nextcloud
+    dump_postgresql ncd_pg $CONTAINERS_ROOT/dump/nextcloud
     let rc=rc+$?
-    dump_postgresql gitea_pg $DOCKER_ROOT/dump/gitea
+    dump_postgresql gitea_pg $CONTAINERS_ROOT/dump/gitea
     let rc=rc+$?
     if [ $rc -gt 0 ]; then
         return 1
@@ -44,5 +45,9 @@ after_backup() {
     let rc=rc+$?
     copy_to_nas "$BACKUP_TARGET" "$NAS_TARGET"
     let rc=rc+$?
+    update_services
+    let rc=rc+$?
+    check_services
+    let rc=rc+$?
     return $rc
 }