X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6e605414d88a1917bd204522b0df68ea47fec11..e9c660be11df0b39f5bd5e14cbc7c2f641715698:/config/initializers/action_mailer.rb diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index 98b599ce9..392191259 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,16 +1,20 @@ -# Configure ActionMailer +# 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 +# Set the host and protocol for all ActionMailer URLs +ActionMailer::Base.default_url_options = { + :host => Settings.server_url, + :protocol => Settings.server_protocol +}