diff options
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index f155ed7a4..f76a1f533 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -1,8 +1,18 @@ +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__), '..', 'config', 'test'), true) +else + MySociety::Config.set_file(File.join(File.dirname(__FILE__), '..', 'config', 'general'), true) +end +MySociety::Config.load_default + # Configuration values with defaults # TODO: Make this return different values depending on the current rails environment -module Configuration +module AlaveteliConfiguration DEFAULTS = { :ADMIN_PASSWORD => '', :ADMIN_USERNAME => '', @@ -57,7 +67,7 @@ module Configuration :WORKING_OR_CALENDAR_DAYS => 'working', } - def Configuration.method_missing(name) + def AlaveteliConfiguration.method_missing(name) key = name.to_s.upcase if DEFAULTS.has_key?(key.to_sym) MySociety::Config.get(key, DEFAULTS[key.to_sym]) |