e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

[backend] Add support for a second config file containing secrets

Browse source 
This is required for some packaging scenarios
This commit is contained in:
Laura Hausmann 2023-11-25 03:03:47 +01:00
parent 5490137f44
commit 026538f8a1
Signed by: zotan
GPG key ID: D044E84C5BE01605
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/backend/src/config/load.ts
View file

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