Put ActionMailer configuration in the right place.

This commit is contained in:
Tom Hughes 2009-05-30 15:41:23 +00:00
parent 50ffd2678c
commit 418668a7da
2 changed files with 4 additions and 3 deletions

View file

@ -1,10 +1,13 @@
# Configure ActionMailer # Configure ActionMailer SMTP settings
ActionMailer::Base.smtp_settings = { ActionMailer::Base.smtp_settings = {
:address => 'localhost', :address => 'localhost',
:port => 25, :port => 25,
:domain => 'localhost', :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 # Monkey patch to fix return-path bug in ActionMailer 2.2.2
# Can be removed once we go to 2.3 # Can be removed once we go to 2.3
module Net module Net

View file

@ -2,5 +2,3 @@
# Load application config # Load application config
APP_CONFIG = YAML.load(File.read(RAILS_ROOT + "/config/application.yml"))[RAILS_ENV] 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']