DEV: Remove automatic_backups_enabled setting

Drenmi · Drenmi · commit 67aadab663af · 2025-07-10T15:17:34.000+08:00
diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb
@@ -7,7 +7,8 @@ class ScheduleBackup < ::Jobs::Scheduled
 
     def execute(args)
       delete_prior_to_n_days
-      return unless SiteSetting.enable_backups? && SiteSetting.automatic_backups_enabled?
+      return if !SiteSetting.enable_backups?
+      return if SiteSetting.backup_frequency.blank?
 
       store = BackupRestore::BackupStore.create
       if latest_backup = store.latest_file
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
@@ -2024,8 +2024,7 @@ en:
     allow_restore: "Allow restore, which can replace ALL site data! Leave disabled unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep. Older backups are automatically deleted"
     remove_older_backups: "Remove backups older than the specified number of days. Leave blank to disable."
-    automatic_backups_enabled: "Run automatic backups as defined in backup frequency"
-    backup_frequency: "Specifies the interval, in days, at which automatic backups of the site are created. If set to 7, for example, a new backup will be generated every week. The activation of this setting is contingent upon `automatic_backups_enabled`."
+    backup_frequency: "Specifies the interval, in days, at which automatic backups of the site are created. If set to 7, for example, a new backup will be generated every week. Leave blank to disable."
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
     s3_endpoint: "The endpoint can be modified to backup to an S3 compatible service like DigitalOcean Spaces or Minio. WARNING: Leave blank if using AWS S3."
     s3_configure_tombstone_policy: "Enable automatic deletion policy for tombstone uploads. IMPORTANT: If disabled, no space will be reclaimed after uploads are deleted."
diff --git a/config/site_settings.yml b/config/site_settings.yml
@@ -3089,8 +3089,6 @@ backups:
   remove_older_backups:
     client: true
     default: ""
-  automatic_backups_enabled:
-    default: true
   backup_frequency:
     min: 1
     max: 30
diff --git a/script/bulk_import/vanilla.rb b/script/bulk_import/vanilla.rb
@@ -63,7 +63,7 @@ def execute
 
     # SiteSetting.port = 3000
     # SiteSetting.permalink_normalizations = "/discussion\/(\d+)\/.*/discussion/\1"
-    # SiteSetting.automatic_backups_enabled = false
+    # SiteSetting.backup_frequency = nil
     # SiteSetting.disable_emails = "non-staff"
     # SiteSetting.authorized_extensions = '*'
     # SiteSetting.max_image_size_kb = 102400
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
@@ -48,7 +48,7 @@ def initialize
 
   def execute
     # enable as per requirement:
-    # SiteSetting.automatic_backups_enabled = false
+    # SiteSetting.backup_frequency = nil
     # SiteSetting.disable_emails = "non-staff"
     # SiteSetting.authorized_extensions = '*'
     # SiteSetting.max_image_size_kb = 102400
diff --git a/script/bulk_import/vbulletin5.rb b/script/bulk_import/vbulletin5.rb
@@ -58,7 +58,7 @@ def initialize
 
   def execute
     # enable as per requirement:
-    #SiteSetting.automatic_backups_enabled = false
+    #SiteSetting.backup_frequency = nil
     #SiteSetting.disable_emails = "non-staff"
     #SiteSetting.authorized_extensions = '*'
     #SiteSetting.max_image_size_kb = 102400
diff --git a/spec/lib/backup_restore/shared_examples_for_backup_store.rb b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
@@ -170,7 +170,7 @@
         expect(store.files).to eq([backup1])
       end
 
-      it "runs if SiteSetting.automatic_backups_enabled? is true" do
+      it "runs if SiteSetting.backup_frequency is configured" do
         base_backup_s3_url = "https://s3-backup-bucket.s3.dualstack.us-west-1.amazonaws.com"
         stub_request(:get, "#{base_backup_s3_url}/?list-type=2&prefix=default/").to_return(
           status: 200,
@@ -180,7 +180,7 @@
         )
         stub_request(:head, "#{base_backup_s3_url}/").to_return(status: 200, body: "", headers: {})
 
-        SiteSetting.automatic_backups_enabled = true
+        SiteSetting.backup_frequency = 1
         scheduleBackup = Jobs::ScheduleBackup.new
         scheduleBackup.expects(:delete_prior_to_n_days)
         scheduleBackup.perform
