diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-07 15:25:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 15:25:53 +0200 |
| commit | e0c39f9fad837b77373220515f078f2443ddf553 (patch) | |
| tree | 70579b7050c39a90fbe35102d315f19410671541 /config/environments | |
| parent | 3f9959a4b66c8d33a1de6dd13972327ff62f2cd3 (diff) | |
| parent | ed8a0bfbb80a759dc6944f599b89e52acb1e83b0 (diff) | |
Merge pull request #1736 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/production.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 40fcd3bdd..8d82a46f6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -95,11 +95,12 @@ Rails.application.configure do config.action_mailer.default_options = { from: outgoing_email_address, - reply_to: ENV['SMTP_REPLY_TO'], - return_path: ENV['SMTP_RETURN_PATH'], message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" }, } + config.action_mailer.default_options[:reply_to] = ENV['SMTP_REPLY_TO'] if ENV['SMTP_REPLY_TO'].present? + config.action_mailer.default_options[:return_path] = ENV['SMTP_RETURN_PATH'] if ENV['SMTP_RETURN_PATH'].present? + config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], :address => ENV['SMTP_SERVER'], |