X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6..496a872f02e9446533bc6dfb8b4ac3fd91bf3cf2:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 54da28139..392191259 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,13 +1,20 @@
+# 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,
+  :openssl_verify_mode => Settings.smtp_tls_verify_mode,
+  :authentication => Settings.smtp_authentication,
+  :user_name => Settings.smtp_user_name,
+  :password => Settings.smtp_password
 }
 
 # Set the host and protocol for all ActionMailer URLs
 ActionMailer::Base.default_url_options = {
-  :host => SERVER_URL,
-  :protocol => SERVER_PROTOCOL
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
 }