summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaccoon2017-02-15 17:26:26 +0800
committerGitHub2017-02-15 17:26:26 +0800
commite19712321fc9358429d5f2a67fb1e5556d08bbba (patch)
treefc761a27b0fda5d43ea997c653287b5fae6a918d
parentfda08bcaec86848844da9933513ed41185169bdc (diff)
parentd29aff6505ddb7e49153a5fc2082bc3efe08e512 (diff)
Merge pull request #358 from MikeMichel/patch-1
first envs then the config
Diffstat (limited to '')
-rw-r--r--lib/config.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/config.js b/lib/config.js
index bdc2cbdb..a14bf978 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -33,7 +33,7 @@ var defaultpermission = process.env.HMD_DEFAULT_PERMISSION || config.defaultperm
defaultpermission = permissions.indexOf(defaultpermission) != -1 ? defaultpermission : 'editable';
// db
-var dburl = config.dburl || process.env.HMD_DB_URL || process.env.DATABASE_URL;
+var dburl = process.env.HMD_DB_URL || process.env.DATABASE_URL || config.dburl;
var db = config.db || {};
// ssl path