logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c019b0acfd0c47693f89b320b6a8b9083a271f08
parent: 7447e7a2ea3749fb84dac38387a1f207554749ec
Author: Effy Elden <github@effy.is>
Date:   Fri, 14 Apr 2017 19:02:25 +1000

Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745)


Diffstat:

Mconfig/environments/production.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb @@ -98,7 +98,7 @@ Rails.application.configure do :address => ENV['SMTP_SERVER'], :user_name => ENV['SMTP_LOGIN'], :password => ENV['SMTP_PASSWORD'], - :domain => ENV['SMTP_DOMAIN'] || config.x.local_domain, + :domain => ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'], :authentication => ENV['SMTP_AUTH_METHOD'] || :plain, :openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'], :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,