djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 08:34:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: support both DATABASE_URL and DB_PASS (#26295)

Browse Source
This commit is contained in:
Emelia Smith 2023-08-18 15:05:35 +02:00 committed by GitHub
parent bb51c0676d
commit 6375e390af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
streaming/index.js
View File

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