From 87efa3872193084468c25f410f5cf9189c0b976e Mon Sep 17 00:00:00 2001
From: amazedkoumei <amazed.koumei@gmail.com>
Date: Mon, 26 Jun 2017 01:13:31 +0900
Subject: 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
---
 streaming/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'streaming/index.js')

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,
     },
 
-- 
cgit