merge branch V2_5

2 files changed, 6 insertions, 5 deletions

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0d33ac03c..3d7819639 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -69,10 +69,11 @@ ChouetteIhm::Application.configure do
   # Configure the e-mail address which will be shown in Devise::Maile
   config.mailer_sender = "appli@chouette.mobi"
 
-  ActionMailer::Base.smtp_settings = {
-    :address        => "smtp.samle.com",
-    :domain         => "sample.com"
-  }
+ config.action_mailer.delivery_method = :sendmail 
+  # change to true to allow email to be sent during development
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default :charset => "utf-8"
 
   # api key to geoportail IGN (development key 3 month validity)
   # config.geoportail_api_key = "f1t6wihbh98njlbaf5cuzxy4"
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a320dc448..d81fa354c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -152,7 +152,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.5.1/chouette" : ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.5.2/chouette" : ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end