From: Miguel Jacq <mig@mig5.net>
Date: Thu, 20 Apr 2017 01:12:14 +0000 (+1000)
Subject: Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwi... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b79ba3db8a2c494b994f7cb7b6e70d8f945f8820;p=mastodon.git

Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index a4cdb2732..eff4c293f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -98,12 +98,10 @@ Rails.application.configure do
   config.action_mailer.smtp_settings = {
     :port                 => ENV['SMTP_PORT'],
     :address              => ENV['SMTP_SERVER'],
-    :user_name            => ENV['SMTP_LOGIN'],
-    :password             => ENV['SMTP_PASSWORD'],
-
+    :user_name            => ENV['SMTP_LOGIN'].presence,
+    :password             => ENV['SMTP_PASSWORD'].presence,
     :domain               => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'],
     :authentication       => ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain,
-
     :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
   }