Merge branch 'master' into envvar

This commit is contained in:
Danny Coates 2017-07-24 14:06:55 -07:00 committed by GitHub
commit 117c6ea12d
9 changed files with 19 additions and 11 deletions

View file

@ -41,6 +41,11 @@ const conf = convict({
format: Number,
default: 1024 * 1024 * 1024 * 2,
env: 'MAX_FILE_SIZE'
},
expire_seconds: {
format: Number,
default: 86400,
env: 'EXPIRE_SECONDS'
}
});