Merge branch 'master' into on-redis-expire

This commit is contained in:
Danny Coates 2018-01-31 13:10:05 -08:00 committed by GitHub
commit af3848586c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 4178 additions and 1427 deletions

View file

@ -19,6 +19,11 @@ const conf = convict({
default: false,
env: 'REDIS_EVENT_EXPIRE'
},
listen_address: {
format: 'ipaddress',
default: '0.0.0.0',
env: 'IP_ADDRESS'
},
listen_port: {
format: 'port',
default: 1443,