Merge branch 'main' into glitch-soc/merge-upstream

2022-04-07 15:03:54 +02:00
parent 3f9959a4b6 ce9dcbea32
commit 489f250877
7 changed files with 95 additions and 13 deletions
--- 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'],