diff --git a/lib/config.js b/lib/config.js index 550f6b1..0ade58a 100644 --- a/lib/config.js +++ b/lib/config.js @@ -58,7 +58,6 @@ function getEnv (prefix, name) { return process.env[envVar.toUpperCase().replace(/-/g, '_')] } - /** * Parse the server configuration settings from the environment. */ @@ -179,7 +178,7 @@ function loadConfig (prefix, localConfig) { const commonConfig = Immutable.fromJS({server, db, keys}) - return commonConfig.merge(localConfig || {}) + return commonConfig.mergeDeep(localConfig || {}) } module.exports = {