Weitere podman-Anpassungen, DB-Dump geändert
This commit is contained in:
1 parent
15f77b6bf5
commit
a8a00a9f46
4 files changed
+73
-36
No files matched your search
+47
-18
@@ -24,6 +24,10 @@ 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
|
||||
@@ -95,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"
|
||||
@@ -109,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 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 \$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 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
|
||||
is_error $? false && return 1
|
||||
done
|
||||
return 0
|
||||
@@ -141,29 +149,50 @@ 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
|
||||
return $?
|
||||
else
|
||||
log $DEBUG "$DBG > sudo systemctl start pihole"
|
||||
sudo systemctl start pihole >>$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_containers() {
|
||||
log $DEBUG "$DBG stop_docker()"
|
||||
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 $?
|
||||
else
|
||||
log $DEBUG "$DBG > sudo systemctl stop pihole"
|
||||
sudo systemctl stop pihole >>$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
|
||||
|
||||
Reference in new issue
Block a user