Merge remote-tracking branch 'upstream/pull/3049'

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 27030d541150e14534520c15f537997bd19e4c6b..e15aaad4961335ca2356ee3313d78bc88fccc232 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,16 @@
-# Configure ActionMailer
+# 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,
+  :authentication => Settings.smtp_authentication,
+  :user_name => Settings.smtp_user_name,
+  :password => Settings.smtp_password
+}
+
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
 }