From 04e28903ea0ce62034d6560373634aef04531702 Mon Sep 17 00:00:00 2001 From: boban Date: Wed, 29 Apr 2026 18:59:37 +0200 Subject: [PATCH] Fix: Backup-Script direkt auf clubird-Namen umgestellt, Workaround entfernt --- app/Console/Commands/BackupRun.php | 13 +------------ scripts/mailwolt-backup | 4 ++-- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/app/Console/Commands/BackupRun.php b/app/Console/Commands/BackupRun.php index ea02b7b..19d6663 100644 --- a/app/Console/Commands/BackupRun.php +++ b/app/Console/Commands/BackupRun.php @@ -37,18 +37,7 @@ class BackupRun extends Command } } - // Dateiname auf clubird-Präfix normalisieren falls das Script noch mailwolt_ ausgibt - if ($artifact && file_exists($artifact)) { - $basename = basename($artifact); - if (str_starts_with($basename, 'mailwolt_')) { - $renamed = dirname($artifact) . '/clubird_' . substr($basename, strlen('mailwolt_')); - if (rename($artifact, $renamed)) { - $artifact = $renamed; - } - } - } - - $this->finalize($job, $exitCode, implode("\n", array_slice($output, -30)), $artifact); +$this->finalize($job, $exitCode, implode("\n", array_slice($output, -30)), $artifact); $this->cleanTmp($tmpDir); return $exitCode === 0 ? self::SUCCESS : self::FAILURE; } diff --git a/scripts/mailwolt-backup b/scripts/mailwolt-backup index 2a4ac32..7ded07f 100644 --- a/scripts/mailwolt-backup +++ b/scripts/mailwolt-backup @@ -6,8 +6,8 @@ APP_DIR="/var/www/mailwolt" APP_USER="www-data" OUT_DIR="${APP_DIR}/storage/app/backups" STAMP="$(date +%Y-%m-%d_%H-%M-%S)" -OUT_FILE="${OUT_DIR}/mailwolt_${STAMP}.tar.gz" -TMP_DIR="$(mktemp -d /tmp/mailwolt_backup_XXXXXX)" +OUT_FILE="${OUT_DIR}/clubird_${STAMP}.tar.gz" +TMP_DIR="$(mktemp -d /tmp/clubird_backup_XXXXXX)" cleanup(){ rm -rf "$TMP_DIR"; } trap cleanup EXIT