diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-10-18 17:57:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 17:57:42 -0400 |
| commit | c75665127878f41af2547b12b8723963c04d305b (patch) | |
| tree | d8275432c259d0fcd1385c163d7f2472b4a8684c /streaming | |
| parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
| parent | eb907a5babed83a73788b16772fb2cba6db8c2b4 (diff) | |
Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
Merge with upstream v2.0.0
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/index.js b/streaming/index.js index 017073fa1..83903b89b 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -80,7 +80,7 @@ const startWorker = (workerId) => { development: { user: process.env.DB_USER || pg.defaults.user, password: process.env.DB_PASS || pg.defaults.password, - database: 'mastodon_development', + database: process.env.DB_NAME || 'mastodon_development', host: process.env.DB_HOST || pg.defaults.host, port: process.env.DB_PORT || pg.defaults.port, max: 10, |