From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 10 Mar 2019 23:51:23 +0000 (+0100)
Subject: Fix streaming API always attempting to use SSL with Postgres (#10231)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=13a7f05030cdcbab24aeb25944a9a430238dbff1;p=mastodon.git

Fix streaming API always attempting to use SSL with Postgres (#10231)

Fix #10223
---

diff --git a/streaming/index.js b/streaming/index.js
index 86a91d12b..2a51a1a0d 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -89,7 +89,6 @@ const startWorker = (workerId) => {
       host:     process.env.DB_HOST || pg.defaults.host,
       port:     process.env.DB_PORT || pg.defaults.port,
       max:      10,
-      ssl:      !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
     },
 
     production: {
@@ -99,11 +98,15 @@ const startWorker = (workerId) => {
       host:     process.env.DB_HOST || 'localhost',
       port:     process.env.DB_PORT || 5432,
       max:      10,
-      ssl:      !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined,
     },
   };
 
-  const app    = express();
+  if (!!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable') {
+    pgConfigs.development.ssl = true;
+    pgConfigs.production.ssl  = true;
+  }
+
+  const app = express();
   app.set('trusted proxy', process.env.TRUSTED_PROXY_IP || 'loopback,uniquelocal');
 
   const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)));