From fc01d919936e016daf841ec734f9dd8fd97a5f60 Mon Sep 17 00:00:00 2001
From: Henare Degan <henare.degan@gmail.com>
Date: Sun, 9 Dec 2012 17:36:08 +1100
Subject: Move Rails config over

---
 lib/configuration.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'lib/configuration.rb')

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
-- 
cgit v1.2.3