Merge remote-tracking branch 'upstream/pull/5346'

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index e15aaad4961335ca2356ee3313d78bc88fccc232..3921912594d156f3e54b1b7ac139aa444b534c20 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,9 +1,13 @@
+# Configure queue to use for ActionMailer deliveries
+ActionMailer::Base.deliver_later_queue_name = :mailers
+

 # Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
   :address => Settings.smtp_address,
   :port => Settings.smtp_port,
   :domain => Settings.smtp_domain,
   :enable_starttls_auto => Settings.smtp_enable_starttls_auto,
 # Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
   :address => Settings.smtp_address,
   :port => Settings.smtp_port,
   :domain => Settings.smtp_domain,
   :enable_starttls_auto => Settings.smtp_enable_starttls_auto,

+  :openssl_verify_mode => Settings.smtp_tls_verify_mode,

   :authentication => Settings.smtp_authentication,
   :user_name => Settings.smtp_user_name,
   :password => Settings.smtp_password
   :authentication => Settings.smtp_authentication,
   :user_name => Settings.smtp_user_name,
   :password => Settings.smtp_password