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] 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