X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7fc2dbecd572718421d000441ccb305241e7d5ff..17c706291c6f250e46300637f5b61c3b46bb0924:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 27030d541..021a4c25d 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,10 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
-  :address  => "localhost",
-  :port  => 25, 
-  :domain  => 'localhost',
+  :address => "localhost",
+  :port => 25,
+  :domain => "localhost",
+  :enable_starttls_auto => false
 }
+
+# Set the host and protocol for all action mailer urls
+ActionMailer::Base.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }