diff --git a/miyagi-backup.sh b/miyagi-backup.sh index 417e8dc..5bfaff1 100644 --- a/miyagi-backup.sh +++ b/miyagi-backup.sh @@ -178,6 +178,7 @@ write_zsync_config() { } run_zsync() { + write_zsync_config if [[ "$ZSYNC" != "no" ]]; then /usr/bin/bashclub-zsync -c "/etc/bashclub/$SOURCEHOST.conf" else @@ -255,7 +256,7 @@ run_remote_updates() { # PBS-Host-Update if [[ "${BACKUPSERVER,,}" == "yes" ]]; then log "Running updates on PBS host ($PBSHOST)..." - ssh root@"$PBSHOST" apt update && ssh root@"$PBSHOST" apt dist-upgrade -y || { + ssh -p $PBSPORT root@"$PBSHOST" apt update && ssh -p $PBSPORT root@"$PBSHOST" apt dist-upgrade -y || { log "Error during updates on $PBSHOST" } else @@ -371,10 +372,10 @@ run_maintenance() { if [[ "$(date +%u)" == "$MAINTDAY" ]]; then log "Running maintenance..." - PRUNEJOB=$(ssh "$PBSHOST" proxmox-backup-manager prune-job list --output-format json-pretty | grep -m 1 "id" | cut -d'"' -f4) - ssh root@"$PBSHOST" proxmox-backup-manager prune-job run "$PRUNEJOB" - ssh root@"$PBSHOST" proxmox-backup-manager garbage-collection start "$BACKUPSTOREPBS" - ssh root@"$PBSHOST" proxmox-backup-manager verify backup + PRUNEJOB=$(ssh -p $PBSPORT "$PBSHOST" proxmox-backup-manager prune-job list --output-format json-pretty | grep -m 1 "id" | cut -d'"' -f4) + ssh -p $PBSPORT root@"$PBSHOST" proxmox-backup-manager prune-job run "$PRUNEJOB" + ssh -p $PBSPORT root@"$PBSHOST" proxmox-backup-manager garbage-collection start "$BACKUPSTOREPBS" + ssh -p $PBSPORT root@"$PBSHOST" proxmox-backup-manager verify backup else log "No maintenance scheduled for today." fi @@ -670,8 +671,9 @@ if [[ $# -eq 0 ]]; then if [[ "${BACKUPSERVER,,}" == "yes" ]]; then log "BACKUPSERVER ist aktiviert, führe Backup aus..." - run_maintenance run_pbs_backup + run_maintenance + else log "BACKUPSERVER ist nicht aktiviert (BACKUPSERVER=$BACKUPSERVER), überspringe Backup." fi