From 6377736f432d988fe80158f1bb81a8feb894c0a7 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Mon, 24 May 2021 11:41:35 +0100
Subject: [PATCH] Allow :site_url to be picked up from ENV vars

---
 config/initializers/spree.rb    | 1 +
 lib/spree/core/mail_settings.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index e2c78e5f78..53c10cc979 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -18,6 +18,7 @@ Spree::Gateway.class_eval do
 end
 
 Spree.config do |config|
+  config.site_url = ENV['SITE_URL'] if ENV['SITE_URL']
   config.shipping_instructions = true
   config.address_requires_state = true
   config.admin_interface_logo = '/default_images/ofn-logo.png'
diff --git a/lib/spree/core/mail_settings.rb b/lib/spree/core/mail_settings.rb
index dde88bbb22..2c8261b246 100644
--- a/lib/spree/core/mail_settings.rb
+++ b/lib/spree/core/mail_settings.rb
@@ -12,7 +12,7 @@ module Spree
       end
 
       def override!
-        ActionMailer::Base.default_url_options[:host] ||= Config.site_url
+        ActionMailer::Base.default_url_options[:host] ||= ENV.fetch("SITE_URL", Config.site_url)
         ActionMailer::Base.smtp_settings = mail_server_settings
         ActionMailer::Base.perform_deliveries = true
       end