From 2d94636b58f504d00c11108872c611367232208c Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 20 Apr 2017 11:12:14 +1000 Subject: [PATCH] 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) --- config/environments/production.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index a4cdb27323..eff4c293f1 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, }