misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into merge/2024-02-03

Browse source
This commit is contained in:
Hazelnoot 2025-02-11 10:52:52 -05:00
commit feb80ee992
42 changed files with 1707 additions and 1351 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ type RedisOptionsSource = Partial<RedisOptions> & {
type Source = {
url?: string;
port?: number;
address?: string;
socket?: string;
chmodSocket?: string;
disableHsts?: boolean;
@ -133,6 +134,7 @@ type Source = {
export type Config = {
url: string;
port: number;
address: string;
socket: string | undefined;
chmodSocket: string | undefined;
disableHsts: boolean | undefined;
@ -309,6 +311,7 @@ export function loadConfig(): Config {
setupPassword: config.setupPassword,
url: url.origin,
port: config.port ?? parseInt(process.env.PORT ?? '3000', 10),
address: config.address ?? '0.0.0.0',
socket: config.socket,
chmodSocket: config.chmodSocket,
disableHsts: config.disableHsts,
@ -511,7 +514,7 @@ function applyEnvOverrides(config: Source) {
// these are all the settings that can be overridden
_apply_top([['url', 'port', 'socket', 'chmodSocket', 'disableHsts', 'id', 'dbReplications']]);
_apply_top([['url', 'port', 'address', 'socket', 'chmodSocket', 'disableHsts', 'id', 'dbReplications']]);
_apply_top(['db', ['host', 'port', 'db', 'user', 'pass', 'disableCache']]);
_apply_top(['dbSlaves', Array.from((config.dbSlaves ?? []).keys()), ['host', 'port', 'db', 'user', 'pass']]);
_apply_top([