From e0103a7fbd0a6e534b4e103919acc078b101807e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 3 Nov 2020 14:50:02 -0800 Subject: [PATCH] Fixed #8595 - Updated spatie settings --- .env.example | 7 ++++- config/backup.php | 73 ++++++++++++++++++----------------------------- 2 files changed, 33 insertions(+), 47 deletions(-) diff --git a/.env.example b/.env.example index af0e127eef..6e9212671f 100644 --- a/.env.example +++ b/.env.example @@ -51,7 +51,6 @@ MAIL_FROM_ADDR=you@example.com MAIL_FROM_NAME='Snipe-IT' MAIL_REPLYTO_ADDR=you@example.com MAIL_REPLYTO_NAME='Snipe-IT' -MAIL_BACKUP_NOTIFICATION_ADDRESS=you@example.com # -------------------------------------------- # REQUIRED: IMAGE LIBRARY @@ -138,3 +137,9 @@ GOOGLE_MAPS_API= BACKUP_ENV=true LDAP_MEM_LIM=500M LDAP_TIME_LIM=600 + +# -------------------------------------------- +# BACKUP SETTINGS +# -------------------------------------------- +MAIL_BACKUP_NOTIFICATION_DRIVER=null +MAIL_BACKUP_NOTIFICATION_ADDRESS=null \ No newline at end of file diff --git a/config/backup.php b/config/backup.php index cf10005918..e4cba34fe9 100644 --- a/config/backup.php +++ b/config/backup.php @@ -55,28 +55,14 @@ return [ /* * Determines if symlinks should be followed. */ - 'followLinks' => false, + 'follow_links' => false, + + /* + * Determines if it should avoid unreadable folders. + */ + 'ignore_unreadable_directories' => false, ], - /* - * The names of the connections to the databases that should be backed up - * MySQL, PostgreSQL, SQLite and Mongo databases are supported. - * - * The content of the database dump may be customized for each connection - * by adding a 'dump' key to the connection settings in config/database.php. - * E.g. - * 'mysql' => [ - * ... - * 'dump' => [ - * 'excludeTables' => [ - * 'table_to_exclude_from_backup', - * 'another_table_to_exclude' - * ] - * ] - * ], - * - * For a complete list of available customization options, see https://github.com/spatie/db-dumper - */ 'databases' => [ env('DB_CONNECTION', 'mysql'), ], @@ -118,7 +104,7 @@ return [ /* * 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. + * For Slack you need to install guzzlehttp/guzzle and laravel/slack-notification-channel. * * You can also use your own notification classes, just make sure the class is named after one of * the `Spatie\Backup\Events` classes. @@ -126,12 +112,12 @@ return [ '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'], + \Spatie\Backup\Notifications\Notifications\BackupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], + \Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], + \Spatie\Backup\Notifications\Notifications\CleanupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], + \Spatie\Backup\Notifications\Notifications\BackupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], + \Spatie\Backup\Notifications\Notifications\HealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], + \Spatie\Backup\Notifications\Notifications\CleanupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)], ], /* @@ -164,22 +150,16 @@ return [ * If a backup does not meet the specified requirements the * UnHealthyBackupWasFound event will be fired. */ - 'monitorBackups' => [ + 'monitor_backups' => [ [ 'name' => config('app.name'), 'disks' => [env('PRIVATE_FILESYSTEM_DISK', 'local')], - 'newestBackupsShouldNotBeOlderThanDays' => 1, - 'storageUsedMayNotBeHigherThanMegabytes' => 5000, + 'health_checks' => [ + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays::class => 1, + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumStorageInMegabytes::class => 5000, + ], ], - /* - [ - 'name' => 'name of the second app', - 'disks' => ['local', 's3'], - 'newestBackupsShouldNotBeOlderThanDays' => 1, - 'storageUsedMayNotBeHigherThanMegabytes' => 5000, - ], - */ ], 'cleanup' => [ @@ -194,38 +174,39 @@ return [ */ 'strategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class, - 'defaultStrategy' => [ + 'default_strategy' => [ /* * The number of days for which backups must be kept. */ - 'keepAllBackupsForDays' => 7, + 'keep_all_backups_for_days' => 7, /* * The number of days for which daily backups must be kept. */ - 'keepDailyBackupsForDays' => 16, + 'keep_daily_backups_for_days' => 16, /* * The number of weeks for which one weekly backup must be kept. */ - 'keepWeeklyBackupsForWeeks' => 8, + 'keep_weekly_backups_for_weeks' => 8, /* * The number of months for which one monthly backup must be kept. */ - 'keepMonthlyBackupsForMonths' => 3, + 'keep_monthly_backups_for_months' => 4, /* * The number of years for which one yearly backup must be kept. */ - 'keepYearlyBackupsForYears' => 2, + 'keep_yearly_backups_for_years' => 2, /* * After cleaning up the backups remove the oldest backup until * this amount of megabytes has been reached. */ - 'deleteOldestBackupsWhenUsingMoreMegabytesThan' => 5000, + 'delete_oldest_backups_when_using_more_megabytes_than' => 5000, ], ], -]; + +]; \ No newline at end of file