forked from treehouse/mastodon
Add `SMTP_RETURN_PATH` environment variable to set bounce domain (#17886)
parent
2c45859ca9
commit
56edc6552f
|
@ -91,11 +91,13 @@ Rails.application.configure do
|
||||||
|
|
||||||
# E-mails
|
# E-mails
|
||||||
outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost')
|
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 = {
|
config.action_mailer.default_options = {
|
||||||
from: outgoing_email_address,
|
from: outgoing_email_address,
|
||||||
reply_to: ENV['SMTP_REPLY_TO'],
|
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 = {
|
config.action_mailer.smtp_settings = {
|
||||||
|
|
Loading…
Reference in New Issue