tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

more free pgconfig by .env (#3909)

Browse Source 
* more free pgconfig for streaming by .env

* fix wrong default values

* database.yml read ENV as same as streaming server
This commit is contained in:
amazedkoumei 2017-06-26 01:13:31 +09:00 committed by Eugen Rochko
parent f7301bd5b9
commit 87efa38721
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/database.yml
View File

@ -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

6
streaming/index.js
View File

@ -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,
}, },