Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream

2023-08-24 20:55:28 +02:00
parent e67c28a5fe ee702e36e5
commit 1b5d3fdc5e
7 changed files with 73 additions and 15 deletions
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -110,6 +110,11 @@ const pgConfigFromEnv = (env) => {

  if (env.DATABASE_URL) {
    baseConfig = dbUrlToConfig(env.DATABASE_URL);
+
+    // Support overriding the database password in the connection URL
+    if (!baseConfig.password && env.DB_PASS) {
+      baseConfig.password = env.DB_PASS;
+    }
  } else {
    baseConfig = pgConfigs[environment];