Explorar el Código

Set default From address in config (#3756)

The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.

In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.

After appling this change,

In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
master
Akihiko Odaki (@fn_aki@pawoo.net) hace 6 años
committed by Eugen Rochko
padre
commit
2083000027
Se han modificado 5 ficheros con 6 adiciones y 2 borrados
  1. +0
    -1
      app/mailers/application_mailer.rb
  2. +0
    -1
      app/mailers/user_mailer.rb
  3. +2
    -0
      config/environments/development.rb
  4. +2
    -0
      config/environments/production.rb
  5. +2
    -0
      config/environments/test.rb

+ 0
- 1
app/mailers/application_mailer.rb Ver fichero

@@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true


class ApplicationMailer < ActionMailer::Base class ApplicationMailer < ActionMailer::Base
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
layout 'mailer' layout 'mailer'
helper :instance helper :instance




+ 0
- 1
app/mailers/user_mailer.rb Ver fichero

@@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true


class UserMailer < Devise::Mailer class UserMailer < Devise::Mailer
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
layout 'mailer' layout 'mailer'


helper :instance helper :instance


+ 2
- 0
config/environments/development.rb Ver fichero

@@ -62,6 +62,8 @@ Rails.application.configure do
# routes, locales, etc. This feature depends on the listen gem. # routes, locales, etc. This feature depends on the listen gem.
# config.file_watcher = ActiveSupport::EventedFileUpdateChecker # config.file_watcher = ActiveSupport::EventedFileUpdateChecker


config.action_mailer.default_options = { from: 'notifications@localhost' }

# If using a Heroku, Vagrant or generic remote development environment, # If using a Heroku, Vagrant or generic remote development environment,
# use letter_opener_web, accessible at /letter_opener. # use letter_opener_web, accessible at /letter_opener.
# Otherwise, use letter_opener, which launches a browser window to view sent mail. # Otherwise, use letter_opener, which launches a browser window to view sent mail.


+ 2
- 0
config/environments/production.rb Ver fichero

@@ -73,6 +73,8 @@ 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') }

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'],


+ 2
- 0
config/environments/test.rb Ver fichero

@@ -30,6 +30,8 @@ Rails.application.configure do
config.action_controller.allow_forgery_protection = false config.action_controller.allow_forgery_protection = false
config.action_mailer.perform_caching = false config.action_mailer.perform_caching = false


config.action_mailer.default_options = { from: 'notifications@localhost' }

# Tell Action Mailer not to deliver emails to the real world. # Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the # The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.


Cargando…
Cancelar
Guardar