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
---
 config/database.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

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