about summary refs log tree commit diff
diff options
context:
space:
mode:
authoramazedkoumei <amazed.koumei@gmail.com>2017-06-26 01:13:31 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-25 18:13:31 +0200
commit87efa3872193084468c25f410f5cf9189c0b976e (patch)
tree07debe9376299631613160eb54c7709bc77a0bfe
parentf7301bd5b94d3033b5dbb9ff65dd1ed8ac825ce5 (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
-rw-r--r--config/database.yml8
-rw-r--r--streaming/index.js6
2 files changed, 13 insertions, 1 deletions
diff --git a/config/database.yml b/config/database.yml
index 39393e93a..079ea7b4a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -7,6 +7,10 @@ default: &default
 development:
   <<: *default
   database: mastodon_development
+  username: <%= ENV['DB_USER'] %>
+  password: <%= ENV['DB_PASS'] %>
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -14,6 +18,10 @@ development:
 test:
   <<: *default
   database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %>
+  username: <%= ENV['TEST_DB_USER'] %>
+  password: <%= ENV['TEST_DB_PASS'] %>
+  host: <%= ENV['TEST_DB_HOST'] %>
+  port: <%= ENV['TEST_DB_PORT'] %>
 
 production:
   <<: *default
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,
     },