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

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 021a4c25d269f8fe62c509527ba688b6100ec281..e6ec032aaa8bdd8103c08477c0cf12e8fdd7f6de 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,10 +1,19 @@
+# Configure queue to use for ActionMailer deliveries
+ActionMailer::Base.deliver_later_queue_name = :mailers
+
 # Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
-  :address => "localhost",
-  :port => 25,
-  :domain => "localhost",
-  :enable_starttls_auto => false
+  :address => Settings.smtp_address,
+  :port => Settings.smtp_port,
+  :domain => Settings.smtp_domain,
+  :enable_starttls_auto => Settings.smtp_enable_starttls_auto,
+  :authentication => Settings.smtp_authentication,
+  :user_name => Settings.smtp_user_name,
+  :password => Settings.smtp_password
 }
 
-# Set the host and protocol for all action mailer urls
-ActionMailer::Base.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
+}