This commit is contained in:
Lloyd Brookes
2015-11-13 20:22:10 +00:00
parent fc2548e40e
commit b116426640
2 changed files with 6 additions and 15 deletions

View File

@ -19,11 +19,13 @@ try {
halt(err.message)
}
options.stored = loadConfig('local-web-server')
options.stored = Object.assign({
blacklist: []
}, loadConfig('local-web-server'))
options.builtIn = {
port: 8000,
directory: process.cwd(),
blacklist: []
directory: process.cwd()
}
/* override built-in defaults with stored config and then command line args */