From b38567149629a906a485dda8e700125902ba4c09 Mon Sep 17 00:00:00 2001
From: Derek Ekins <derek@spathi.com>
Date: Tue, 17 Aug 2021 13:22:13 +0100
Subject: [PATCH 1/2] get smtp configuration from env variables

---
 config/environments/production.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index ec099ca..d51c858 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -76,10 +76,10 @@
   config.i18n.fallbacks = true
 
   ActionMailer::Base.smtp_settings = {
-    address: 'smtp.sendgrid.net',
+    address: ENV['SMTP_SERVER'],
     port: 587,
-    user_name: ENV['SENDGRID_USERNAME'],
-    password: ENV['SENDGRID_PASSWORD'],
+    user_name: ENV['SMTP_USERNAME'],
+    password: ENV['SMTP_PASSWORD'],
     domain: 'carbonneutralmap.org.uk',
     authentication: :plain,
     enable_starttls_auto: true

From a4dd2e97701188b81b7d20872e7dac60c49f89b4 Mon Sep 17 00:00:00 2001
From: Derek Ekins <derek@spathi.com>
Date: Tue, 17 Aug 2021 13:27:14 +0100
Subject: [PATCH 2/2] upgrade mimemagic

---
 Gemfile.lock | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3995df0..9a28ec1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,9 @@ GEM
     meta-tags (2.13.0)
       actionpack (>= 3.2.0, < 6.1)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -342,4 +344,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   2.1.4
+   2.2.5