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 servergh/stable
parent
f7301bd5b9
commit
87efa38721
|
@ -7,6 +7,10 @@ default: &default
|
||||||
development:
|
development:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: mastodon_development
|
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
|
# Warning: The database defined as "test" will be erased and
|
||||||
# re-generated from your development database when you run "rake".
|
# re-generated from your development database when you run "rake".
|
||||||
|
@ -14,6 +18,10 @@ development:
|
||||||
test:
|
test:
|
||||||
<<: *default
|
<<: *default
|
||||||
database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %>
|
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:
|
production:
|
||||||
<<: *default
|
<<: *default
|
||||||
|
|
|
@ -78,7 +78,11 @@ const startWorker = (workerId) => {
|
||||||
|
|
||||||
const pgConfigs = {
|
const pgConfigs = {
|
||||||
development: {
|
development: {
|
||||||
database: 'mastodon_development',
|
user: process.env.DB_USER || pg.defaults.user,
|
||||||
|
password: process.env.DB_PASS || pg.defaults.password,
|
||||||
|
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,
|
max: 10,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Reference in New Issue