first envs then the config

or docker -e will not work
This commit is contained in:
Mike 2017-02-15 10:22:38 +01:00 committed by GitHub
parent fda08bcaec
commit d29aff6505

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