diff --git a/.npmignore b/.npmignore index 119a6a4..25c1af6 100644 --- a/.npmignore +++ b/.npmignore @@ -1,3 +1,4 @@ test test_results -node_modules \ No newline at end of file +node_modules +etc/*_dev.json \ No newline at end of file diff --git a/lib/config.js b/lib/config.js index 29e786e..35a380d 100644 --- a/lib/config.js +++ b/lib/config.js @@ -79,6 +79,8 @@ function Config(jsonFilename, checkKey) { process.exit(1); } + json.key = process.env.REDSMIN_KEY || json.key; + // valid the connection key if(!!checkKey && Config.checkKey(json.key)){ process.exit(1); diff --git a/package.json b/package.json index 3efb180..fd1a740 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "redsmin", "description": "Redsmin daemon for the Redsmin service", - "version": "0.1.9", + "version": "0.2.0", "keywords": [ "redis", "redsmin", @@ -24,10 +24,10 @@ "redsmin": "./bin/redsmin" }, "dependencies": { - "lodash": "~0.3.1", + "lodash": "~0.3.2", "winston": "~0.6.1", "backoff": "0.0.2", - "daemonize": "~0.3.1" + "daemonize2": "~0.4.0-rc.5" }, "devDependencies": { "sinon": "~1.3.4", @@ -35,7 +35,7 @@ "nodeunit": "~0.7.4" }, "engines": { - "node": ">=0.6" + "node": ">=0.8" }, "repository": { "type": "git",