diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-07 15:03:54 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-07 15:03:54 +0200 |
| commit | 489f2508772a7214c219e66f8fa1aeea07ab6c08 (patch) | |
| tree | 924b55981c4a10e06e499579b9e8beb3680c3a25 /config | |
| parent | 3f9959a4b66c8d33a1de6dd13972327ff62f2cd3 (diff) | |
| parent | ce9dcbea32e7212dc19d83bbb7a21afe8756ced0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
| -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'], |