alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use-DB_NAME-in-development (#5430)

signup-info-prompt
masarakki 2017-10-17 18:45:37 +09:00 committed by Eugen Rochko
parent 554c2fd8af
commit 0e0c6b1b4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/database.yml
View File

@ -6,7 +6,7 @@ default: &default
development: development:
<<: *default <<: *default
database: mastodon_development database: <%= ENV['DB_NAME'] || 'mastodon_development' %>
username: <%= ENV['DB_USER'] %> username: <%= ENV['DB_USER'] %>
password: <%= ENV['DB_PASS'] %> password: <%= ENV['DB_PASS'] %>
host: <%= ENV['DB_HOST'] %> host: <%= ENV['DB_HOST'] %>
@ -17,7 +17,7 @@ development:
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
<<: *default <<: *default
database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %> database: <%= ENV['DB_NAME'] || 'mastodon' %>_test<%= ENV['TEST_ENV_NUMBER'] %>
username: <%= ENV['DB_USER'] %> username: <%= ENV['DB_USER'] %>
password: <%= ENV['DB_PASS'] %> password: <%= ENV['DB_PASS'] %>
host: <%= ENV['DB_HOST'] %> host: <%= ENV['DB_HOST'] %>

2
streaming/index.js
View File

@ -80,7 +80,7 @@ const startWorker = (workerId) => {
development: { development: {
user: process.env.DB_USER || pg.defaults.user, user: process.env.DB_USER || pg.defaults.user,
password: process.env.DB_PASS || pg.defaults.password, 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, host: process.env.DB_HOST || pg.defaults.host,
port: process.env.DB_PORT || pg.defaults.port, port: process.env.DB_PORT || pg.defaults.port,
max: 10, max: 10,