diff options
author | amazedkoumei <amazed.koumei@gmail.com> | 2017-06-26 01:13:31 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-25 18:13:31 +0200 |
commit | 87efa3872193084468c25f410f5cf9189c0b976e (patch) | |
tree | 07debe9376299631613160eb54c7709bc77a0bfe /streaming | |
parent | f7301bd5b94d3033b5dbb9ff65dd1ed8ac825ce5 (diff) |
more free pgconfig by .env (#3909)
* more free pgconfig for streaming by .env * fix wrong default values * database.yml read ENV as same as streaming server
Diffstat (limited to 'streaming')
-rw-r--r-- | streaming/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/streaming/index.js b/streaming/index.js index 156e1d4bc..701cb2f55 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -78,7 +78,11 @@ const startWorker = (workerId) => { const pgConfigs = { development: { - database: 'mastodon_development', + user: process.env.DB_USER || pg.defaults.user, + password: process.env.DB_PASS || pg.defaults.password, + 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, }, |