diff options
| author | Michel Etienne | 2014-06-24 16:41:49 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-06-24 16:41:49 +0200 |
| commit | 7909f7db83dbdeee280a7010bdf0a90d2b7e7e95 (patch) | |
| tree | 58be95372f7f7d77643af8e14dc0ce65d604cd0d /config | |
| parent | 3d046b1a470712836a2bfe15f0be46cd8cc5c73b (diff) | |
| parent | e511535bcca2e090899db2f697c1d9ceac8c4c9b (diff) | |
| download | chouette-core-7909f7db83dbdeee280a7010bdf0a90d2b7e7e95.tar.bz2 | |
merge V2_4
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/environment.rb b/config/environment.rb index 5353fe344..299eb7b07 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__) ChouetteIhm::Application.initialize! # Fix version -APP_VERSION = '2.4.0' +APP_VERSION = '2.4.1' diff --git a/config/environments/production.rb b/config/environments/production.rb index 8f4d09b1c..68002de35 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -111,7 +111,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.4.0/chouette" ; ENV['CHOUETTE_GUI_COMMAND'] + Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.4.1/chouette" : ENV['CHOUETTE_GUI_COMMAND'] ImportTask.root = "/var/lib/chouette/imports" Export.root = "/var/lib/chouette/exports" end |