diff options
| author | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
| commit | f7491de676298b8f78084c00f0026f8cf36d92fc (patch) | |
| tree | 0ac29d1598efeb2a0de9bd1b54ae7590e88479da /config/environments | |
| parent | f37056e6c351a08d09c3986586cc7d27bdea85ab (diff) | |
| parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
Update to Mastodon 2.5.0
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/production.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 1d9063cd6..4446a9152 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -87,11 +87,13 @@ Rails.application.configure do # E-mails outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') - outgoing_mail_domain = Mail::Address.new(outgoing_email_address).domain + outgoing_email_domain = Mail::Address.new(outgoing_email_address).domain + config.action_mailer.default_options = { from: outgoing_email_address, reply_to: ENV['SMTP_REPLY_TO'], - 'Message-ID': -> { "<#{Mail.random_tag}@#{outgoing_mail_domain}>" }, + return_path: ENV['SMTP_RETURN_PATH'], + message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" }, } config.action_mailer.smtp_settings = { |