Move the default_url_options config to the action_mailer initializer

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 1467b6fe66d8dfc9f600feb177d09d683ee7707e..021a4c25d269f8fe62c509527ba688b6100ec281 100644 (file)
--- 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 }