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

* config: add DB_SSLMODE for managed/remote PG

* streaming: set PG sslmode, defaults to prefer

diff --git a/config/database.yml b/config/database.yml
index 82e560515c872a2ec0be9c03d2843707ce0180b8..c10bff6b2e6da96c935715f65c75283f4f50fea3 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,6 +3,7 @@ default: &default
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
   encoding: unicode
+  sslmode: <%= ENV['DB_SSLMODE'] || "prefer" %>
 
 development:
   <<: *default
@@ -31,3 +32,4 @@ production:
   host: <%= ENV['DB_HOST'] || 'localhost' %>
   port: <%= ENV['DB_PORT'] || 5432 %>
   prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
+

diff --git a/streaming/index.js b/streaming/index.js
index b4d09d0ad2c7d60b0a0c7b1d74a7404a133d9a12..21a1d47ef237a2741048393e1455d782019c1173 100644 (file)
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -89,6 +89,9 @@ const startWorker = (workerId) => {
       host:     process.env.DB_HOST || pg.defaults.host,
       port:     process.env.DB_PORT || pg.defaults.port,
       max:      10,
+      ssl: {
+        sslmode: process.env.DB_SSLMODE || 'prefer',
+      },
     },
 
     production: {
@@ -98,6 +101,9 @@ const startWorker = (workerId) => {
       host:     process.env.DB_HOST || 'localhost',
       port:     process.env.DB_PORT || 5432,
       max:      10,
+      ssl: {
+        sslmode: process.env.DB_SSLMODE || 'prefer',
+      },
     },
   };