pass confit options from kraken startup options

lib/config.js

@@ -22,7 +22,7 @@ var path = require('path');
 var confit = require('confit');
 var handlers = require('shortstop-handlers');
 var ssresolve = require('shortstop-resolve');
-
+var merge = require('lodash.merge');
 
 function createHandlers(options) {
  var result;
@@ -50,26 +50,30 @@ function configPath(prefix) {
 
 
 exports.create = function create(options) {
- var deferred, appProtocols, baseProtocols, baseFactory, appFactory;
+ var deferred, appProtocols, baseProtocols, baseFactory, appFactory, baseConfig, appConfig;
 
  deferred = Bluebird.pending();
  appProtocols = createHandlers(options);
  baseProtocols = createHandlers(options);
-
+ baseConfig = merge({
+ basedir: configPath(path.dirname(__dirname)),
+ protocols: baseProtocols
+ }, options.confit || {});
+ appConfig = merge({
+ basedir: configPath(options.basedir),
+ protocols: appProtocols
+ }, options.confit || {});
  appProtocols.resolve = ssresolve(configPath(options.basedir));
  baseProtocols.resolve = ssresolve(configPath(path.dirname(__dirname)));
 
- baseFactory = confit({ basedir: configPath(path.dirname(__dirname)), protocols: baseProtocols });
+ baseFactory = confit(baseConfig);
  baseFactory.create(function(err, baseConf) {
  if (err) {
  deferred.reject(err);
  return;
  }
 
- appFactory = confit({
- basedir: configPath(options.basedir),
- protocols: appProtocols
- });
+ appFactory = confit(appConfig);
  appFactory.create(function(err, appConf) {
  if (err) {
  deferred.reject(err);

package.json

@@ -73,7 +73,7 @@
  "body-parser": "^1.12.2",
  "caller": "^1.0.0",
  "compression": "^1.4.3",
- "confit": "^2.0.3",
+ "confit": "git://github.com/grawk/confit.git#feature.env.ignore",
  "cookie-parser": "^1.3.4",
  "core-util-is": "^1.0.1",
  "debuglog": "^1.0.1",
@@ -82,6 +82,7 @@
  "express-enrouten": "^1.2.0",
  "express-session": "^1.10.4",
  "formidable": "^1.0.17",
+ "lodash.merge": "^4.6.0",
  "lusca": "^1.0.3",
  "meddleware": "^3.0.2",
  "morgan": "^1.5.2",