zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

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

This commit is contained in:
Eugen Rochko 2022-04-07 13:32:12 +02:00 committed by GitHub
parent 1b91359a45
commit 8c03b45fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/environments/production.rb
View File

@ -95,11 +95,12 @@ Rails.application.configure do
config.action_mailer.default_options = { config.action_mailer.default_options = {
from: outgoing_email_address, from: outgoing_email_address,
reply_to: ENV['SMTP_REPLY_TO'],
return_path: ENV['SMTP_RETURN_PATH'],
message_id: -> { "<#{Mail.random_tag}@#{outgoing_email_domain}>" }, 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 = { config.action_mailer.smtp_settings = {
:port => ENV['SMTP_PORT'], :port => ENV['SMTP_PORT'],
:address => ENV['SMTP_SERVER'], :address => ENV['SMTP_SERVER'],