diff options
| author | masarakki <masaki182@gmail.com> | 2017-10-17 18:45:37 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-17 11:45:37 +0200 |
| commit | 0e0c6b1b4bea4a45e8a19eac00c2f2d48681257c (patch) | |
| tree | ca9e03f4b69f6c0e54c1eb9cb76a03304d2f6d79 | |
| parent | 554c2fd8af79c173e81d7193ea649fa848076123 (diff) | |
use-DB_NAME-in-development (#5430)
| -rw-r--r-- | config/database.yml | 4 | ||||
| -rw-r--r-- | streaming/index.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/database.yml b/config/database.yml index f74635a36..82e560515 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,7 +6,7 @@ default: &default development: <<: *default - database: mastodon_development + database: <%= ENV['DB_NAME'] || 'mastodon_development' %> username: <%= ENV['DB_USER'] %> password: <%= ENV['DB_PASS'] %> host: <%= ENV['DB_HOST'] %> @@ -17,7 +17,7 @@ development: # Do not set this db to the same as development or production. test: <<: *default - database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %> + database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %> username: <%= ENV['DB_USER'] %> password: <%= ENV['DB_PASS'] %> host: <%= ENV['DB_HOST'] %> diff --git a/streaming/index.js b/streaming/index.js index 017073fa1..83903b89b 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -80,7 +80,7 @@ const startWorker = (workerId) => { development: { user: process.env.DB_USER || pg.defaults.user, password: process.env.DB_PASS || pg.defaults.password, - database: 'mastodon_development', + 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, |