diff options
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/environments/production.rb | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 2d411fb2c..07005e9f9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,9 +53,5 @@ module ChouetteIhm # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - ActionMailer::Base.smtp_settings = { - :address => "mail.dryade.priv", - :domain => "dryade.priv" - } end end diff --git a/config/environments/production.rb b/config/environments/production.rb index 5793f9ab1..a5c58b56d 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,7 +77,7 @@ ChouetteIhm::Application.configure do if ENV['OS'] == 'Windows_NT' ## using SMTP (maybe useful for Windows or VM platforms): ActionMailer::Base.delivery_method = :smtp - ActionMailer::Base.server_settings = { + ActionMailer::Base.smtp_settings = { :address => "smtp.sample.com", #:port => 25, :domain => "sample.com", @@ -90,8 +90,13 @@ ChouetteIhm::Application.configure do else ## using SENDMAIL (easy on Linux platforms) : ActionMailer::Base.delivery_method = :sendmail + ActionMailer::Base.smtp_settings = { + :address => "mail.dryade.priv", + :domain => "dryade.priv" + } end + # paths for external resources if ENV['OS'] == 'Windows_NT' config.to_prepare do |