diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-11 10:52:52 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-11 10:52:52 -0500 |
| commit | feb80ee992c8cf2d719b089023b1352052aaad2d (patch) | |
| tree | d4559dc61e763b8b431abeaa8e0a3c30663dadaf /packages/backend/src/config.ts | |
| parent | Merge branch 'develop' into merge/2024-02-03 (diff) | |
| parent | merge: Cleanup and bulk fixes to Mastodon API (resolves #495, #509, #707, #7... (diff) | |
| download | sharkey-feb80ee992c8cf2d719b089023b1352052aaad2d.tar.gz sharkey-feb80ee992c8cf2d719b089023b1352052aaad2d.tar.bz2 sharkey-feb80ee992c8cf2d719b089023b1352052aaad2d.zip | |
Merge branch 'develop' into merge/2024-02-03
Diffstat (limited to 'packages/backend/src/config.ts')
| -rw-r--r-- | packages/backend/src/config.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 843c552254..d35befdc2b 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -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([ |