diff options
| author | Akihiko Odaki (@fn_aki@pawoo.net) <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-07-07 07:12:12 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-07 00:12:12 +0200 |
| commit | 2083000027451249836c369eb961300d7faf5f99 (patch) | |
| tree | b65fa158ac68e0135abbb843fa3ddc19b03dc47b /config/environments/production.rb | |
| parent | 18d3fa953b5af8ab17cc93c33cb95cec37127712 (diff) | |
Set default From address in config (#3756)
The old implementation sets default From address in mailers. It sets the address from SMTP_FROM_ADDRESS, or notifications@localhost. The behavior is occasionally undesired results. In production environment, notifications@localhost is likely to be incorrect. In testing environment, the email address should not be varied by a environment variable. After appling this change, In production environment, it will throw an exception when launching Mastodon. In testing environment, the address will be fixed with notifications@localhost.
Diffstat (limited to 'config/environments/production.rb')
| -rw-r--r-- | config/environments/production.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index bd87d79a7..d9c9da684 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,6 +73,8 @@ Rails.application.configure do config.action_mailer.perform_caching = false # E-mails + config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') } + config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], :address => ENV['SMTP_SERVER'], |