From 87687c0819f8627fec36209ad4b3762fd85a3cee Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Fri, 6 Mar 2020 14:29:00 -0300 Subject: [PATCH] Drop unnecessary readonly_during_backup setting (#9112) --- config/locales/server.en.yml | 1 - config/site_settings.yml | 2 -- lib/backup_restore/backuper.rb | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 3705e98f010..9bd64c7dbf5 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1647,7 +1647,6 @@ en: discord_secret: "Discord Secret Key" discord_trusted_guilds: 'Only allow members of these Discord guilds to login via Discord. Use the numeric ID for the guild. For more information, check the instructions here. Leave blank to allow any guild.' - readonly_mode_during_backup: "Enable read only mode while taking a backup" enable_backups: "Allow administrators to create backups of the forum" allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup" maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted" diff --git a/config/site_settings.yml b/config/site_settings.yml index 6ea8733db4d..a2320348a11 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1649,8 +1649,6 @@ backups: enable_backups: default: true client: true - readonly_mode_during_backup: - default: false allow_restore: default: false backup_location: diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb index 3068ecb2a49..0ae246dd888 100644 --- a/lib/backup_restore/backuper.rb +++ b/lib/backup_restore/backuper.rb @@ -106,7 +106,7 @@ module BackupRestore end @logs = [] - @readonly_mode_was_enabled = Discourse.readonly_mode? || !SiteSetting.readonly_mode_during_backup + @readonly_mode_was_enabled = Discourse.readonly_mode? end def listen_for_shutdown_signal