depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #358 from MikeMichel/patch-1

Browse source 
first envs then the config
This commit is contained in:
Raccoon 2017-02-15 17:26:26 +08:00 committed by GitHub
parent fda08bcaec d29aff6505
commit e19712321f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config.js
View file

@ -33,7 +33,7 @@ var defaultpermission = process.env.HMD_DEFAULT_PERMISSION || config.defaultperm
defaultpermission = permissions.indexOf(defaultpermission) != -1 ? defaultpermission : 'editable'; defaultpermission = permissions.indexOf(defaultpermission) != -1 ? defaultpermission : 'editable';
// db // 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 || {}; var db = config.db || {};
// ssl path // ssl path