From 5960a5425d561271ba0b35da50b8d8bcdd56fa92 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 8 May 2023 14:48:26 -0700 Subject: [PATCH 1/2] Pass filename to pre-import backup Signed-off-by: snipe --- app/Http/Controllers/Api/ImportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 914c16f8d..2d7e2f7d7 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -160,7 +160,7 @@ class ImportController extends Controller // Run a backup immediately before processing if ($request->get('run-backup')) { \Log::debug('Backup manually requested via importer'); - Artisan::call('backup:run'); + Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]); } else { \Log::debug('NO BACKUP requested via importer'); } From 332b017dccc6b815f3f7804fad44d52eb2313fe9 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 8 May 2023 15:00:02 -0700 Subject: [PATCH 2/2] Pass filename for manual backups Signed-off-by: snipe --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index c65dbc7d2..c626203cf 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -1094,7 +1094,7 @@ class SettingsController extends Controller public function postBackups() { if (! config('app.lock_passwords')) { - Artisan::call('backup:run'); + Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H:i:s')]); $output = Artisan::output(); // Backup completed