diff options
| author | Michel Etienne | 2013-05-27 14:47:47 +0200 |
|---|---|---|
| committer | Michel Etienne | 2013-05-27 14:47:47 +0200 |
| commit | 4124a427d6422c11c93d8a488710ec945e1225ca (patch) | |
| tree | e87034f0dcb4e217e65624e14cf7ddc771147cf8 /config | |
| parent | feb1ae3352bbe29e1f934f7ec617f68b9faded9b (diff) | |
| parent | 01b38ce952cb2e657ab387295673fc892be3539a (diff) | |
| download | chouette-core-4124a427d6422c11c93d8a488710ec945e1225ca.tar.bz2 | |
Merge branch 'master' of github.com:dryade/chouette2
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/environments/production.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index b619645d3..519ff1d24 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -43,6 +43,9 @@ ChouetteIhm::Application.configure do :domain => "dryade.priv" } + # api key to geoportail IGN (development key 3 month validity) + config.geoportail_api_key = "i2aqyge3x3iovnuhz7z06flp" + config.to_prepare do Devise::Mailer.layout "mailer" #ApplicationMap.ign_api_key = "i2aqyge3x3iovnuhz7z06flp" diff --git a/config/environments/production.rb b/config/environments/production.rb index a5c58b56d..ba7b4748e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -57,6 +57,9 @@ ChouetteIhm::Application.configure do # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false + # + # api key to geoportail IGN (production key link to "chouette.dryade.net" referer) + config.geoportail_api_key = "bt4z711qv8uw4zmk2bxl4d5l" # Enable threaded mode # NOTICE : With Rails 3.2, Delayed::JRubyWorker blocks the application without threaded mode |