From 56edc6552f71a1f58fd8ca5ea2f0603015be0c2c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 28 Mar 2022 09:39:31 +0200
Subject: [PATCH] Add `SMTP_RETURN_PATH` environment variable to set bounce
domain (#17886)
---
config/environments/production.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7fe3810406..b003cce9ed 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -91,11 +91,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 = {
--
GitLab