diff options
| author | Marc Florisson | 2013-05-23 10:21:15 +0200 |
|---|---|---|
| committer | Marc Florisson | 2013-05-23 10:21:15 +0200 |
| commit | baf4983fce9de9f1d4b8b288f23c39ef86f51e69 (patch) | |
| tree | 052a0791ff5c5968c86d3896d3cd8078ee6c303c | |
| parent | a80e3496452341b0dab50716eb95137553814bcf (diff) | |
| parent | b969f68d302ba441dd18c13dcefbc646996a6112 (diff) | |
| download | chouette-core-baf4983fce9de9f1d4b8b288f23c39ef86f51e69.tar.bz2 | |
Merge branch 'master' of github.com:dryade/chouette2
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/environments/production.rb | 7 | ||||
| -rw-r--r-- | config/warble.rb | 2 |
3 files changed, 7 insertions, 6 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 diff --git a/config/warble.rb b/config/warble.rb index 11c6bf090..9574700d5 100644 --- a/config/warble.rb +++ b/config/warble.rb @@ -11,7 +11,7 @@ Warbler::Config.new do |config| # config.features = %w(gemjar) # Application directories to be included in the webapp. - config.dirs = %w(app config lib log vendor tmp db) + config.dirs = %w(app config lib vendor db) # Additional files/directories to include, above those in config.dirs #config.includes = FileList["db"] |