From 026538f8a19d2ffe26f182a9c1bb5b4b0adcc816 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 25 Nov 2023 03:03:47 +0100 Subject: [PATCH] [backend] Add support for a second config file containing secrets This is required for some packaging scenarios --- packages/backend/src/config/load.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/config/load.ts b/packages/backend/src/config/load.ts index 1a8a7302c..5d894b023 100644 --- a/packages/backend/src/config/load.ts +++ b/packages/backend/src/config/load.ts @@ -16,6 +16,7 @@ export default function load() { const dir = `${_dirname}/../../../..`; const { ICESHRIMP_CONFIG: configFile, + ICESHRIMP_SECRETS: secretsFile, ICESHRIMP_MEDIA_DIR: mediaDir, } = process.env; @@ -33,7 +34,9 @@ export default function load() { "utf-8", ), ); - const config = yaml.load(fs.readFileSync(path, "utf-8")) as Source; + let config = yaml.load(fs.readFileSync(path, "utf-8")) as Source; + if (secretsFile !== undefined) + config = Object.assign(config, yaml.load(fs.readFileSync(secretsFile, "utf-8")) as Source); const mixin = {} as Mixin;