From 732d0f7cf4124b7711c98d1aa087b1661ce9cb96 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 30 Apr 2019 15:46:25 +0100
Subject: [PATCH] Don't use s3 for images unless images bucket has been
 provisioned.

Sets the "use_s3" (for images) option based on presence of `s3_images_bucket` from ofn-install instead of presence of s3 keys, for instances that use s3 for backups but not for images.
---
 config/initializers/spree.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index e05f847f00..d578b316ea 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -25,7 +25,7 @@ Spree.config do |config|
   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']
+  config.use_s3 = true if ENV['S3_BUCKET']
   config.s3_protocol = ENV.fetch('S3_PROTOCOL', 'https')
 end