X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2b7f92029f678417025f57c8f6d28e9aea82ad98..17c706291c6f250e46300637f5b61c3b46bb0924:/config/initializers/action_mailer.rb diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index db6c1b9b7..021a4c25d 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,16 +1,10 @@ # Configure ActionMailer SMTP settings ActionMailer::Base.smtp_settings = { - :address => 'localhost', - :port => 25, - :domain => 'localhost', + :address => "localhost", + :port => 25, + :domain => "localhost", + :enable_starttls_auto => false } -# 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 action mailer urls +ActionMailer::Base.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }