mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

config: add DB_SSLMODE for managed/remote PG (#10210) 

* config: add DB_SSLMODE for managed/remote PG

* streaming: set PG sslmode, defaults to prefer
This commit is contained in:
Sascha 2019-03-08 14:36:28 +01:00 committed by Eugen Rochko
parent 9e33a71efa
commit 42e733681a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/database.yml
View File

@ -3,6 +3,7 @@ default: &default
pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %> pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
timeout: 5000 timeout: 5000
encoding: unicode encoding: unicode
sslmode: <%= ENV['DB_SSLMODE'] || "prefer" %>
development: development:
<<: *default <<: *default
@ -31,3 +32,4 @@ production:
host: <%= ENV['DB_HOST'] || 'localhost' %> host: <%= ENV['DB_HOST'] || 'localhost' %>
port: <%= ENV['DB_PORT'] || 5432 %> port: <%= ENV['DB_PORT'] || 5432 %>
prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %> prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>

6
streaming/index.js
View File

@ -89,6 +89,9 @@ const startWorker = (workerId) => {
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,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
}, },
production: { production: {
@ -98,6 +101,9 @@ const startWorker = (workerId) => {
host: process.env.DB_HOST || 'localhost', host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432, port: process.env.DB_PORT || 5432,
max: 10, max: 10,
ssl: {
sslmode: process.env.DB_SSLMODE || 'prefer',
},
}, },
}; };