OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-15 09:15:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

allow setting values not present in the config file

Browse source 
replicas and arrays in general, are more complicated :/
This commit is contained in:
dakkar 2024-03-24 11:12:17 +00:00
parent 435cab01c8
commit 0e8cdb30b7
1 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
packages/backend/src/config.ts
View file

@ -311,17 +311,13 @@ function convertRedisOptions(options: RedisOptionsSource, host: string): RedisOp
this function allows overriding any string-valued config option with this function allows overriding any string-valued config option with
a sensible-named environment variable a sensible-named environment variable
e.g. `MK_CONFIG_MEILISEARCH_APIKEY` overrides `config.meilisearch.apikey` e.g. `MK_CONFIG_MEILISEARCH_APIKEY` sets `config.meilisearch.apikey`
the option's containing object must be present in the config *file*,
so in the example above, `config.meilisearch` must be set to
something in the file, it can't be completely commented out.
you can also override a single `dbSlave` value, you can also override a single `dbSlave` value,
e.g. `MK_CONFIG_DBSLAVES_1_PASS` sets the password for the 2nd e.g. `MK_CONFIG_DBSLAVES_1_PASS` sets the password for the 2nd
database replica (the first one would be database replica (the first one would be
`MK_CONFIG_DBSLAVES_0_PASS`); again, `config.dbSlaves` must be set `MK_CONFIG_DBSLAVES_0_PASS`); in this case, `config.dbSlaves` must
to an array of the right size already in the file be set to an array of the right size already in the file
values can be read from files, too: setting `MK_DB_PASS_FILE` to values can be read from files, too: setting `MK_DB_PASS_FILE` to
`/some/file` would set the main database password to the contents of `/some/file` would set the main database password to the contents of
@ -332,10 +328,10 @@ function applyEnvOverrides(config: Source) {
// the given steps, building the env variable name // the given steps, building the env variable name
function _apply_top(steps: (string | number)[]) { function _apply_top(steps: (string | number)[]) {
_apply_inner(config, '', steps); _walk('', [], steps);
} }
function _apply_inner(thisConfig: any, name: string, steps: (string | number)[]) { function _walk(name: string, path: (string | number)[], steps: (string | number)[]) {
// are there more steps after this one? recurse // are there more steps after this one? recurse
if (steps.length > 1) { if (steps.length > 1) {
const thisStep = steps.shift(); const thisStep = steps.shift();
@ -344,10 +340,10 @@ function applyEnvOverrides(config: Source) {
// if a step is not a simple value, iterate through it // if a step is not a simple value, iterate through it
if (typeof thisStep === 'object') { if (typeof thisStep === 'object') {
for (const thisOneStep of thisStep) { for (const thisOneStep of thisStep) {
_descend(thisConfig, name, thisOneStep, steps); _descend(name, path, thisOneStep, steps);
} }
} else { } else {
_descend(thisConfig, name, thisStep, steps); _descend(name, path, thisStep, steps);
} }
// the actual override has happened at the bottom of the // the actual override has happened at the bottom of the
@ -360,10 +356,10 @@ function applyEnvOverrides(config: Source) {
if (typeof lastStep === 'object') { if (typeof lastStep === 'object') {
for (const lastOneStep of lastStep) { for (const lastOneStep of lastStep) {
_lastBit(thisConfig, name, lastOneStep); _lastBit(name, path, lastOneStep);
} }
} else { } else {
_lastBit(thisConfig, name, lastStep); _lastBit(name, path, lastStep);
} }
} }
@ -372,29 +368,40 @@ function applyEnvOverrides(config: Source) {
} }
// this recurses down, bailing out if there's no config to override // this recurses down, bailing out if there's no config to override
function _descend(thisConfig: any, name: string, thisStep: string | number, steps: (string | number)[]) { function _descend(name: string, path: (string | number)[], thisStep: string | number, steps: (string | number)[]) {
name = `${name}${_step2name(thisStep)}_`; name = `${name}${_step2name(thisStep)}_`;
thisConfig = thisConfig[thisStep]; path = [ ...path, thisStep ];
if (!thisConfig) return; _walk(name, path, steps);
_apply_inner(thisConfig, name, steps);
} }
// this is the bottom of the recursion: look at the environment and // this is the bottom of the recursion: look at the environment and
// set the value // set the value
function _lastBit(thisConfig: any, name: string, lastStep: string | number) { function _lastBit(name: string, path: (string | number)[], lastStep: string | number) {
name = `${name}${_step2name(lastStep)}`; name = `MK_CONFIG_${name}${_step2name(lastStep)}`;
const val = process.env[`MK_CONFIG_${name}`]; const val = process.env[name];
if (val != null && val != undefined) { if (val != null && val != undefined) {
thisConfig[lastStep] = val; _assign(path, lastStep, val);
} }
const file = process.env[`MK_CONFIG_${name}_FILE`]; const file = process.env[`${name}_FILE`];
if (file) { if (file) {
thisConfig[lastStep] = fs.readFileSync(file, 'utf-8').trim(); _assign(path, lastStep, fs.readFileSync(file, 'utf-8').trim());
} }
} }
function _assign(path: (string | number)[], lastStep: string | number, value: string) {
let thisConfig = config;
for (const step of path) {
if (!thisConfig[step]) {
thisConfig[step] = {};
}
thisConfig = thisConfig[step];
}
thisConfig[lastStep] = value;
}
// these are all the settings that can be overridden // these are all the settings that can be overridden
_apply_top([['url', 'port', 'socket', 'chmodSocket', 'disableHsts']]); _apply_top([['url', 'port', 'socket', 'chmodSocket', 'disableHsts']]);