diff options
| author | Effy Elden <github@effy.is> | 2017-04-14 19:02:25 +1000 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-14 11:02:25 +0200 |
| commit | c019b0acfd0c47693f89b320b6a8b9083a271f08 (patch) | |
| tree | 9fd1dfff0d79578b6db779dc30129fbfdc906406 /config | |
| parent | 7447e7a2ea3749fb84dac38387a1f207554749ec (diff) | |
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 (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 0b0ae29c8..0f1076544 100644 --- 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, |