Comparing version 0.3.2 to 0.3.4
@@ -43,3 +43,3 @@ /** | ||
var privateConfig = load_obj(app, locations.privateConfig); | ||
var config = _.extend({}, publicConfig, privateConfig.privateConfig); | ||
var config = _.extend({}, publicConfig, privateConfig); | ||
@@ -67,3 +67,3 @@ // Temporary duplication for backwards compatibility | ||
pkg: '/../package.json', | ||
privateConfig: '/../../nimbus.json', | ||
privateConfig: '/../../local.config.json', | ||
models: '/models', | ||
@@ -113,2 +113,3 @@ views: '/views', | ||
app.set('view options', app.config.view_options); | ||
app.set('view cache', app.config.view_cache); | ||
app.set('views', app.dir + locations.views); | ||
@@ -161,2 +162,2 @@ app.set('public', app.dir + locations.pub); | ||
this.emit('listen', this.server); | ||
} | ||
} |
{ | ||
"name":"base12", | ||
"description":"12factor.net app platform for node.js, built on express 3", | ||
"version":"0.3.2", | ||
"version":"0.3.4", | ||
"author":"Hunter Loftis <hunter@hunterloftis.com>", | ||
@@ -11,3 +11,4 @@ "contributors": [ | ||
{ "name": "Chris Gomez", "email": "akagomez@gmail.com" }, | ||
{ "name": "Kenny Parnell", "email": "kenny@skoomum.com" } | ||
{ "name": "Kenny Parnell", "email": "kenny@skoomum.com" }, | ||
{ "name": "Raquel Velez", "email": "raquel@skoomum.com" } | ||
], | ||
@@ -14,0 +15,0 @@ "dependencies": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1989929
1020