From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 7 Apr 2022 11:32:12 +0000 (+0200)
Subject: Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send (#17982)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8c03b45fffc54a66d1c9c3eec75a7c6f741d0947;p=mastodon.git

Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send (#17982)
---

diff --git a/config/environments/production.rb b/config/environments/production.rb
index b003cce9e..95f8a6f32 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'],