From: Tdxdxoz <tdxdxoz@gmail.com>
Date: Wed, 15 Jul 2020 12:43:49 +0000 (+0800)
Subject: add ssl option in smtp setting (#14309)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=376b44853fc5cde256986d61dd5eafcf1067de5d;p=mastodon.git

add ssl option in smtp setting (#14309)
---

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