Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-19 21:26:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(services/config): add Sync config block and fallback values

Browse Source 
original idea of using config-sample.ini for default values
is not backwards compatible unfortunately

fallback values taken from config-sample.ini and directly from other code in this codebase, where these values were set
This commit is contained in:
Panagiotis Papadopoulos 2025-01-23 23:58:46 +01:00
parent c7bd5e2c67
commit 85c6764864
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/services/config.ts
View File

@ -38,27 +38,57 @@ export interface TriliumConfig {
syncProxy: string; syncProxy: string;
}; };
} }
//prettier-ignore
const config: TriliumConfig = { const config: TriliumConfig = {
General: { General: {
instanceName: process.env.TRILIUM_GENERAL_INSTANCENAME || iniConfig.General.instanceName, instanceName:
noAuthentication: envToBoolean(process.env.TRILIUM_GENERAL_NOAUTHENTICATION) || iniConfig.General.noAuthentication, process.env.TRILIUM_GENERAL_INSTANCENAME || iniConfig.General.instanceName || "",
noBackup: envToBoolean(process.env.TRILIUM_GENERAL_NOBACKUP) || iniConfig.General.noBackup,
noDesktopIcon: envToBoolean(process.env.TRILIUM_GENERAL_NODESKTOPICON) || iniConfig.General.noDesktopIcon noAuthentication:
envToBoolean(process.env.TRILIUM_GENERAL_NOAUTHENTICATION) || iniConfig.General.noAuthentication || false,
noBackup:
envToBoolean(process.env.TRILIUM_GENERAL_NOBACKUP) || iniConfig.General.noBackup || false,
noDesktopIcon:
envToBoolean(process.env.TRILIUM_GENERAL_NODESKTOPICON) || iniConfig.General.noDesktopIcon || false
}, },
Network: { Network: {
host: process.env.TRILIUM_NETWORK_HOST || iniConfig.Network.host, host:
port: process.env.TRILIUM_NETWORK_PORT || iniConfig.Network.port, process.env.TRILIUM_NETWORK_HOST || iniConfig.Network.host || "0.0.0.0",
https: envToBoolean(process.env.TRILIUM_NETWORK_HTTPS) || iniConfig.Network.https,
certPath: process.env.TRILIUM_NETWORK_CERTPATH || iniConfig.Network.certPath, port:
keyPath: process.env.TRILIUM_NETWORK_KEYPATH || iniConfig.Network.keyPath, process.env.TRILIUM_NETWORK_PORT || iniConfig.Network.port || "3000",
trustedReverseProxy: process.env.TRILIUM_NETWORK_TRUSTEDREVERSEPROXY || iniConfig.Network.trustedReverseProxy
https:
envToBoolean(process.env.TRILIUM_NETWORK_HTTPS) || iniConfig.Network.https || false,
certPath:
process.env.TRILIUM_NETWORK_CERTPATH || iniConfig.Network.certPath || "",
keyPath:
process.env.TRILIUM_NETWORK_KEYPATH || iniConfig.Network.keyPath || "",
trustedReverseProxy:
process.env.TRILIUM_NETWORK_TRUSTEDREVERSEPROXY || iniConfig.Network.trustedReverseProxy || false
}, },
// @TODO correctly define here
//Sync: {} Sync: {
syncServerHost:
process.env.TRILIUM_SYNC_SERVER_HOST || iniConfig?.Sync?.syncServerHost || "",
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 || ""
}
}; };
export default config; export default config;