From 501f096a2c31f920c778b0ba378496ec7c83dbe2 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Jul 2018 01:36:30 -0700 Subject: [PATCH] Updated spatie backup config file for their latest version --- app/Http/Controllers/SettingsController.php | 6 +- config/backup.php | 41 +++-- config/laravel-backup.php | 192 -------------------- 3 files changed, 26 insertions(+), 213 deletions(-) delete mode 100644 config/laravel-backup.php diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 0b48932693..73f9720948 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -908,7 +908,7 @@ class SettingsController extends Controller public function getBackups() { - $path = storage_path().'/app/'.config('laravel-backup.backup.name'); + $path = storage_path().'/app/'.config('backup.backup.name'); $files = array(); @@ -984,7 +984,7 @@ class SettingsController extends Controller public function downloadFile($filename = null) { if (!config('app.lock_passwords')) { - $path = storage_path().'/app/'.config('laravel-backup.backup.name'); + $path = storage_path().'/app/'.config('backup.backup.name'); $file = $path.'/'.$filename; if (file_exists($file)) { return Response::download($file); @@ -1013,7 +1013,7 @@ class SettingsController extends Controller if (!config('app.lock_passwords')) { - $path = storage_path().'/app/'.config('laravel-backup.backup.name'); + $path = storage_path().'/app/'.config('backup.backup.name'); $file = $path.'/'.$filename; if (file_exists($file)) { unlink($file); diff --git a/config/backup.php b/config/backup.php index 7e680a2800..bc45801f4a 100644 --- a/config/backup.php +++ b/config/backup.php @@ -1,5 +1,14 @@ [ @@ -8,7 +17,7 @@ return [ * The name of this application. You can use this name to monitor * the backups. */ - 'name' => config('app.name'), + 'name' => 'backups', 'source' => [ @@ -18,7 +27,12 @@ return [ * The list of directories and files that will be included in the backup. */ 'include' => [ - base_path(), + public_path('uploads'), + storage_path('private_uploads'), + storage_path('oauth-private.key'), + storage_path('oauth-public.key'), + (env('BACKUP_ENV')=='true') ? base_path('.env') : base_path('.env.example'), + ], /* @@ -27,8 +41,8 @@ return [ * Directories used by the backup process will automatically be excluded. */ 'exclude' => [ - base_path('vendor'), - base_path('node_modules'), + // base_path('vendor'), + // base_path('node_modules'), ], /* @@ -49,14 +63,14 @@ return [ /* * The database dump can be gzipped to decrease diskspace usage. */ - 'gzip_database_dump' => false, + 'gzip_database_dump' => true, 'destination' => [ /* * The filename prefix used for the backup zip file. */ - 'filename_prefix' => '', + 'filename_prefix' => 'snipe-it-backup-', /* * The disk names on which the backups will be stored. @@ -65,11 +79,6 @@ return [ 'local', ], ], - - /* - * The directory where the temporary files will be stored. - */ - 'temporary_directory' => storage_path('app/backup-temp'), ], /* @@ -97,7 +106,7 @@ return [ 'notifiable' => \Spatie\Backup\Notifications\Notifiable::class, 'mail' => [ - 'to' => 'your@example.com', + 'to' => null, ], 'slack' => [ @@ -107,11 +116,6 @@ return [ * If this is set to null the default channel of the webhook will be used. */ 'channel' => null, - - 'username' => null, - - 'icon' => null, - ], ], @@ -122,7 +126,7 @@ return [ */ 'monitorBackups' => [ [ - 'name' => config('app.name'), + 'name' => env('APP_NAME'), 'disks' => ['local'], 'newestBackupsShouldNotBeOlderThanDays' => 1, 'storageUsedMayNotBeHigherThanMegabytes' => 5000, @@ -185,3 +189,4 @@ return [ ], ], ]; + diff --git a/config/laravel-backup.php b/config/laravel-backup.php deleted file mode 100644 index bc45801f4a..0000000000 --- a/config/laravel-backup.php +++ /dev/null @@ -1,192 +0,0 @@ - [ - - /* - * The name of this application. You can use this name to monitor - * the backups. - */ - 'name' => 'backups', - - 'source' => [ - - 'files' => [ - - /* - * The list of directories and files that will be included in the backup. - */ - 'include' => [ - public_path('uploads'), - storage_path('private_uploads'), - storage_path('oauth-private.key'), - storage_path('oauth-public.key'), - (env('BACKUP_ENV')=='true') ? base_path('.env') : base_path('.env.example'), - - ], - - /* - * These directories and files will be excluded from the backup. - * - * Directories used by the backup process will automatically be excluded. - */ - 'exclude' => [ - // base_path('vendor'), - // base_path('node_modules'), - ], - - /* - * Determines if symlinks should be followed. - */ - 'followLinks' => false, - ], - - /* - * The names of the connections to the databases that should be backed up - * MySQL, PostgreSQL, SQLite and Mongo databases are supported. - */ - 'databases' => [ - 'mysql', - ], - ], - - /* - * The database dump can be gzipped to decrease diskspace usage. - */ - 'gzip_database_dump' => true, - - 'destination' => [ - - /* - * The filename prefix used for the backup zip file. - */ - 'filename_prefix' => 'snipe-it-backup-', - - /* - * The disk names on which the backups will be stored. - */ - 'disks' => [ - 'local', - ], - ], - ], - - /* - * You can get notified when specific events occur. Out of the box you can use 'mail' and 'slack'. - * For Slack you need to install guzzlehttp/guzzle. - * - * You can also use your own notification classes, just make sure the class is named after one of - * the `Spatie\Backup\Events` classes. - */ - 'notifications' => [ - - 'notifications' => [ - \Spatie\Backup\Notifications\Notifications\BackupHasFailed::class => ['mail'], - \Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFound::class => ['mail'], - \Spatie\Backup\Notifications\Notifications\CleanupHasFailed::class => ['mail'], - \Spatie\Backup\Notifications\Notifications\BackupWasSuccessful::class => ['mail'], - \Spatie\Backup\Notifications\Notifications\HealthyBackupWasFound::class => ['mail'], - \Spatie\Backup\Notifications\Notifications\CleanupWasSuccessful::class => ['mail'], - ], - - /* - * Here you can specify the notifiable to which the notifications should be sent. The default - * notifiable will use the variables specified in this config file. - */ - 'notifiable' => \Spatie\Backup\Notifications\Notifiable::class, - - 'mail' => [ - 'to' => null, - ], - - 'slack' => [ - 'webhook_url' => '', - - /* - * If this is set to null the default channel of the webhook will be used. - */ - 'channel' => null, - ], - ], - - /* - * Here you can specify which backups should be monitored. - * If a backup does not meet the specified requirements the - * UnHealthyBackupWasFound event will be fired. - */ - 'monitorBackups' => [ - [ - 'name' => env('APP_NAME'), - 'disks' => ['local'], - 'newestBackupsShouldNotBeOlderThanDays' => 1, - 'storageUsedMayNotBeHigherThanMegabytes' => 5000, - ], - - /* - [ - 'name' => 'name of the second app', - 'disks' => ['local', 's3'], - 'newestBackupsShouldNotBeOlderThanDays' => 1, - 'storageUsedMayNotBeHigherThanMegabytes' => 5000, - ], - */ - ], - - 'cleanup' => [ - /* - * The strategy that will be used to cleanup old backups. The default strategy - * will keep all backups for a certain amount of days. After that period only - * a daily backup will be kept. After that period only weekly backups will - * be kept and so on. - * - * No matter how you configure it the default strategy will never - * delete the newest backup. - */ - 'strategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class, - - 'defaultStrategy' => [ - - /* - * The number of days for which backups must be kept. - */ - 'keepAllBackupsForDays' => 7, - - /* - * The number of days for which daily backups must be kept. - */ - 'keepDailyBackupsForDays' => 16, - - /* - * The number of weeks for which one weekly backup must be kept. - */ - 'keepWeeklyBackupsForWeeks' => 8, - - /* - * The number of months for which one monthly backup must be kept. - */ - 'keepMonthlyBackupsForMonths' => 4, - - /* - * The number of years for which one yearly backup must be kept. - */ - 'keepYearlyBackupsForYears' => 2, - - /* - * After cleaning up the backups remove the oldest backup until - * this amount of megabytes has been reached. - */ - 'deleteOldestBackupsWhenUsingMoreMegabytesThan' => 5000, - ], - ], -]; -