use-DB_NAME-in-development (mastodon#5430)

julienw · Oct 17, 2017 · 0e0c6b1 · 0e0c6b1
1 parent 554c2fd
commit 0e0c6b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,