From 37cbfcb6925fd0287d830a4dbed65ca943222c2b Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:17:17 +0100
Subject: [PATCH 1/4] Use ENV var for backups bucket

---
 config/initializers/db2fog.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/db2fog.rb b/config/initializers/db2fog.rb
index 7c7a2d6d39..1e05ceae1a 100644
--- a/config/initializers/db2fog.rb
+++ b/config/initializers/db2fog.rb
@@ -2,6 +2,6 @@
 DB2Fog.config = {
     :aws_access_key_id     => Spree::Config[:s3_access_key],
     :aws_secret_access_key => Spree::Config[:s3_secret],
-    :directory             => Spree::Config[:s3_bucket],
+    :directory             => ENV['S3_BACKUPS_BUCKET'],
     :provider              => 'AWS'
 }

From 2ac981a9a30645be82d8c31a440ed1fb4e6d1fb1 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 10 Apr 2019 17:17:43 +0100
Subject: [PATCH 2/4] Make db2fog tasks conditional

---
 config/schedule.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/schedule.rb b/config/schedule.rb
index 4bb20df545..4cb7a5c1ca 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -21,11 +21,11 @@ every 1.day, at: '12:05am' do
 end
 
 every 1.day, at: '2:45am' do
-  rake 'db2fog:clean'
+  rake 'db2fog:clean' if ENV['S3_BACKUPS_BUCKET']
 end
 
 every 4.hours do
-  rake 'db2fog:backup'
+  rake 'db2fog:backup' if ENV['S3_BACKUPS_BUCKET']
 end
 
 every 5.minutes do

From 4912a9e258a7b3d85b175029cd626162d44db806 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 10 Apr 2019 19:10:31 +0100
Subject: [PATCH 3/4] Ensure ENV vars in applications.yml actually update
 stored Spree::Config preferences

---
 config/initializers/spree.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index e63d21bde9..9b2ea5d3c4 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -20,6 +20,12 @@ Spree.config do |config|
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.
   config.auto_capture = true
   #config.override_actionmailer_config = false
+
+  # S3 settings
+  config.s3_bucket = ENV['S3_BUCKET'] if ENV['S3_BUCKET']
+  config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY']
+  config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET']
+  config.use_s3 = true if ENV['S3_ACCESS_KEY'] && ENV['S3_SECRET']
 end
 
 # Don't log users out when setting a new password

From 7373fff1902e40cc9bf7a5b5ca699bce54b1d79b Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 10 Apr 2019 19:23:16 +0100
Subject: [PATCH 4/4] Define default s3_protocol as 'https'

---
 config/initializers/spree.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 9b2ea5d3c4..e05f847f00 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -26,6 +26,7 @@ Spree.config do |config|
   config.s3_access_key = ENV['S3_ACCESS_KEY'] if ENV['S3_ACCESS_KEY']
   config.s3_secret = ENV['S3_SECRET'] if ENV['S3_SECRET']
   config.use_s3 = true if ENV['S3_ACCESS_KEY'] && ENV['S3_SECRET']
+  config.s3_protocol = ENV.fetch('S3_PROTOCOL', 'https')
 end
 
 # Don't log users out when setting a new password