From 618eef680e0ebd3a66eb724b97bd7ab01c1ca7bd Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 1 Mar 2016 14:01:51 -0500
Subject: [PATCH] FEATURE: Disable removal of backups from S3

---
 app/models/backup.rb         | 2 +-
 config/locales/server.en.yml | 1 +
 config/site_settings.yml     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/backup.rb b/app/models/backup.rb
index 40e5b1f71..dfa538121 100644
--- a/app/models/backup.rb
+++ b/app/models/backup.rb
@@ -34,7 +34,7 @@ class Backup
   end
 
   def after_remove_hook
-    remove_from_s3 if SiteSetting.enable_s3_backups?
+    remove_from_s3 if SiteSetting.enable_s3_backups? && !SiteSetting.s3_disable_cleanup?
   end
 
   def s3_bucket
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6e7d5c342..b40600e6c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -956,6 +956,7 @@ en:
     backup_frequency: "How frequently we create a site backup, in days."
     enable_s3_backups: "Upload backups to S3 when complete. IMPORTANT: requires valid S3 credentials entered in Files settings."
     s3_backup_bucket: "The remote bucket to hold backups. WARNING: Make sure it is a private bucket."
+    s3_disable_cleanup: "Disable the removal of backups from S3 when removed locally."
     backup_time_of_day: "Time of day UTC when the backup should occur."
     backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database."
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 15e68c307..a35c30b59 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -885,6 +885,8 @@ backups:
     default: ''
     regex: "^[^A-Z_.]+$" # can't use '.' when using HTTPS
     shadowed_by_global: true
+  s3_disable_cleanup:
+    default: false
   backup_time_of_day:
     default: '3:30'
     regex: "^((0?(0|1|2|3|4|5|6|7|8|9)|(10|11|12|13|14|15|16|17|18|19|20|21|22|23))):\\d\\d$"