From 80d7162abac0e999ef70d0f66c4591b81de30c8d Mon Sep 17 00:00:00 2001
From: Dominic Bosch <dominicsfakeaddress@server.fake>
Date: Thu, 20 Mar 2014 09:16:49 +0100
Subject: [PATCH] conflicts...

---
 coffee/config.coffee |  2 +-
 config/system.json   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 config/system.json

diff --git a/coffee/config.coffee b/coffee/config.coffee
index 1a014d8..58b0c2a 100644
--- a/coffee/config.coffee
+++ b/coffee/config.coffee
@@ -30,7 +30,7 @@ exports = module.exports = ( args ) =>
   if args.configPath
     loadConfigFile args.configPath
   else
-    loadConfigFile path.join 'config', 'config.json'
+    loadConfigFile path.join 'config', 'system.json'
   module.exports
 
 ###
diff --git a/config/system.json b/config/system.json
new file mode 100644
index 0000000..473be0e
--- /dev/null
+++ b/config/system.json
@@ -0,0 +1,10 @@
+{
+  "http-port": 8125,
+  "db-port": 6379,
+  "log": {
+    "mode": "development",
+    "io-level": "info",
+    "file-level": "info",
+    "file-path": "server.log"
+  }
+}
\ No newline at end of file