conflicts...

This commit is contained in:
Dominic Bosch 2014-03-20 09:16:49 +01:00
parent 457a1c0852
commit 80d7162aba
2 changed files with 11 additions and 1 deletions

View file

@ -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
###

10
config/system.json Normal file
View file

@ -0,0 +1,10 @@
{
"http-port": 8125,
"db-port": 6379,
"log": {
"mode": "development",
"io-level": "info",
"file-level": "info",
"file-path": "server.log"
}
}