From: Tom Hughes <tom@compton.nu>
Date: Sat, 30 May 2009 15:41:23 +0000 (+0000)
Subject: Put ActionMailer configuration in the right place.
X-Git-Tag: live~7373
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/418668a7daaaa100fc80be66fbac1a3537dcd1c1?hp=50ffd2678c7b0855399ab6cfd8b6f674d2ee28c9

Put ActionMailer configuration in the right place.
---

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 98b599ce9..2ccc71ff4 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,10 +1,13 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
 }
 
+# This will let you more easily use helpers based on url_for in your mailers.
+ActionMailer::Base.default_url_options[:host] = APP_CONFIG['host']
+
 # Monkey patch to fix return-path bug in ActionMailer 2.2.2
 # Can be removed once we go to 2.3
 module Net
diff --git a/config/initializers/load_configs.rb b/config/initializers/load_configs.rb
index 988f7a7ca..a189ac860 100644
--- a/config/initializers/load_configs.rb
+++ b/config/initializers/load_configs.rb
@@ -2,5 +2,3 @@
 
 # Load application config
 APP_CONFIG = YAML.load(File.read(RAILS_ROOT + "/config/application.yml"))[RAILS_ENV]
-# This will let you more easily use helpers based on url_for in your mailers.
-ActionMailer::Base.default_url_options[:host] = APP_CONFIG['host']