Skip to content
This repository was archived by the owner on Jun 14, 2019. It is now read-only.

Commit

Permalink
Update smtp_settings
Browse files Browse the repository at this point in the history
  • Loading branch information
wilfriedE committed Nov 19, 2017
1 parent 42163f1 commit 192ccf4
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 15 deletions.
8 changes: 6 additions & 2 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@

config.action_mailer.perform_caching = false

config.action_mailer.default charset: "utf-8"
config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
config.action_mailer.perform_deliveries = true
config.action_mailer.delivery_method = :smtp

config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

Expand All @@ -44,8 +50,6 @@

# Suppress logger output for asset requests.
config.assets.quiet = true
config.action_mailer.default_url_options = { host: "localhost", port: 3000 }

# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true

Expand Down
7 changes: 5 additions & 2 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,14 @@
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "learn_it_#{Rails.env}"
config.action_mailer.perform_caching = false
config.action_mailer.default charset: "utf-8"
config.action_mailer.default_url_options = { host: ENV['APP_DOMAIN'] }

config.action_mailer.perform_deliveries = true
config.action_mailer.delivery_method = :smtp
config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
config.action_mailer.raise_delivery_errors = false

# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation cannot be found).
Expand Down
4 changes: 4 additions & 0 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@

# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
config.action_mailer.default charset: "utf-8"
config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
config.action_mailer.perform_deliveries = true
config.action_mailer.delivery_method = :smtp
config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
end
9 changes: 9 additions & 0 deletions config/initializers/mailer_config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ActionMailer::Base.smtp_settings = {
address: ENV["SMTP_ADDRESS"],
port: 587,
domain: ENV["APP_DOMAIN"],
user_name: ENV["MAILER_USERNAME"].present? ? ENV["MAILER_USERNAME"] : ENV["SENDGRID_USERNAME"],
password: ENV["MAILER_PASSWORD"].present? ? ENV["MAILER_PASSWORD"] : ENV["SENDGRID_PASSWORD"],
authentication: :plain,
enable_starttls_auto: true
}
11 changes: 0 additions & 11 deletions config/mailer_config.rb

This file was deleted.

0 comments on commit 192ccf4

Please sign in to comment.