hb/server-backup
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all docker references cleared, fixes

Browse Source
This commit is contained in:
Hartmut Bauer committed 2025-05-09 18:57:23 +02:00
1 parent 27e0889bd1
commit e7b9cc4e15
6 files changed
+92 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main.inc.sh
+32 -26
View File
@@ -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,7 +22,7 @@ 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"
@@ -98,20 +98,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 +151,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 +166,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 +195,12 @@ do_start_stop_containers() {
return $rc
}
check_services() {
log $DEBUG "$DBG check_services()"
$HERE/check.sh >>$LOG_FILE 2>&1
return $?
}
# Zugriffsrechte für Logs und Backups setzen
#
fix_acls() {