From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 16 Jul 2017 21:48:35 +0000 (+0200)
Subject: Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a3202fd51e240050a12ddf1170e3e6e2b1532bbf;p=mastodon.git

Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227)
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index d9c9da684..f1351e378 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -85,6 +85,7 @@ Rails.application.configure do
     :ca_file              => ENV['SMTP_CA_FILE'].presence,
     :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
+    :tls                  => ENV['SMTP_TLS'].presence,
   }
 
   config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym