diff options
author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
---|---|---|
committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
commit | ddafde942ca53816c19b0ea0cb40bb1b46cf5668 (patch) | |
tree | c0ac2138fe994c4c2a15c23b47d4155f75148945 /config/database.yml | |
parent | e6300de1421d28d173658e61601b9e016c3d0a6d (diff) | |
parent | da42bfadb58888e3a18afd66395f0f3edc2fa622 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/database.yml')
-rw-r--r-- | config/database.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/database.yml b/config/database.yml index 39393e93a..f74635a36 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['DB_USER'] %> + password: <%= ENV['DB_PASS'] %> + host: <%= ENV['DB_HOST'] %> + port: <%= ENV['DB_PORT'] %> production: <<: *default |