X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5294e4d989038ae20c1e38622d14f5b54c7d830f..309bd95c571a672bed953ef1e77df6936b2c19f8:/config/initializers/action_mailer.rb?ds=sidebyside

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 37510ac27..392191259 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,38 +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',
+  :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
 }
 
-# Monkey patch to fix return-path bug in ActionMailer 2.2.2
-# Can be removed once we go to 2.3
-module Net
-  class SMTP
-    def sendmail(msgstr, from_addr, *to_addrs)
-      send_message(msgstr, from_addr.to_s.sub(/^<(.*)>$/, "\\1"), *to_addrs)
-    end
-  end
-end
-
-# Monkey patch to allow sending of messages in specific locales
-module ActionMailer
-  class Base
-    adv_attr_accessor :locale
-  private
-    alias_method :old_render_message, :render_message
-
-    def render_message(method_name, body)
-      old_locale= I18n.locale
-
-      begin
-        I18n.locale = @locale
-        message = old_render_message(method_name, body)
-      ensure
-        I18n.locale = old_locale
-      end
-
-      message
-    end
-  end
-end
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
+}