diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-12-09 17:36:08 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-12-11 11:09:31 +1100 |
| commit | fc01d919936e016daf841ec734f9dd8fd97a5f60 (patch) | |
| tree | c8b8d557f1235b97faf2cac50767362a9e497e2e /lib | |
| parent | 92eff943b20e6658b92dfaa7e83ff5a70dbc93d4 (diff) | |
Move Rails config over
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configuration.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 11fe1c56e..9c369b2e7 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -1,3 +1,13 @@ +require File.dirname(__FILE__) + '/../commonlib/rblib/config' + +# Load intial mySociety config +if ENV["RAILS_ENV"] == "test" + MySociety::Config.set_file(File.join(File.dirname(__FILE__), 'test'), true) +else + MySociety::Config.set_file(File.join(File.dirname(__FILE__), 'general'), true) +end +MySociety::Config.load_default + # Configuration values with defaults # TODO: Make this return different values depending on the current rails environment |