forked from treehouse/mastodon
Add SMTP reply_to option (#11718)
* Add SMTP_REPLY_TO in .env.production.sample * Set reply_to in SMTP optionsrebase/4.0.0rc2
parent
1f22b8197c
commit
5466b39c78
|
@ -69,6 +69,7 @@ SMTP_PORT=587
|
||||||
SMTP_LOGIN=
|
SMTP_LOGIN=
|
||||||
SMTP_PASSWORD=
|
SMTP_PASSWORD=
|
||||||
SMTP_FROM_ADDRESS=notifications@example.com
|
SMTP_FROM_ADDRESS=notifications@example.com
|
||||||
|
#SMTP_REPLY_TO=
|
||||||
#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
|
#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
|
||||||
#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
|
#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
|
||||||
#SMTP_AUTH_METHOD=plain
|
#SMTP_AUTH_METHOD=plain
|
||||||
|
|
|
@ -83,7 +83,10 @@ Rails.application.configure do
|
||||||
config.action_mailer.perform_caching = false
|
config.action_mailer.perform_caching = false
|
||||||
|
|
||||||
# E-mails
|
# E-mails
|
||||||
config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') }
|
config.action_mailer.default_options = {
|
||||||
|
from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost'),
|
||||||
|
reply_to: ENV['SMTP_REPLY_TO']
|
||||||
|
}
|
||||||
|
|
||||||
config.action_mailer.smtp_settings = {
|
config.action_mailer.smtp_settings = {
|
||||||
:port => ENV['SMTP_PORT'],
|
:port => ENV['SMTP_PORT'],
|
||||||
|
|
Loading…
Reference in New Issue