diff options
| author | Starfall <us@starfall.systems> | 2022-04-08 01:23:41 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-08 01:23:41 -0500 |
| commit | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (patch) | |
| tree | 8f04f4d701e86d4ddadbdd6054171ed374523a7d /config/environments | |
| parent | f7491de676298b8f78084c00f0026f8cf36d92fc (diff) | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
Merge remote-tracking branch 'glitch/main'
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 4446a9152..77fdb6830 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -91,11 +91,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'], |