gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 11:39:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

feat(services/config): rename syncProxy to syncServerProxy for naming consistency

Browse Source 
backwards compatibility ensured, by still checking the iniConfig for the old value first
This commit is contained in:
Panagiotis Papadopoulos 2025-01-24 07:45:47 +01:00
parent 9cca9fe074
commit 2c2a404056
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-sample.ini
View File

@ -31,4 +31,4 @@ trustedReverseProxy=false
[Sync]
#syncServerHost=
#syncServerTimeout=
#syncProxy=
#syncServerProxy=

5
src/services/config.ts
View File

@ -83,10 +83,9 @@ const config: TriliumConfig = {
syncServerTimeout:
process.env.TRILIUM_SYNC_SERVER_TIMEOUT || iniConfig?.Sync?.syncServerTimeout || "120000",
// @TriliumNextTODO: check if we can rename misnamed syncProxy to syncServerProxy without
// breaking backwards compatibility - for naming consistency
syncProxy:
process.env.TRILIUM_SYNC_SERVER_PROXY || iniConfig?.Sync?.syncProxy || ""
// additionally checking in iniConfig for inconsistently named syncProxy for backwards compatibility
process.env.TRILIUM_SYNC_SERVER_PROXY || iniConfig?.Sync?.syncProxy || iniConfig?.Sync?.syncServerProxy || ""
}
};