Skip to content

Commit

Permalink
fix the env var names
Browse files Browse the repository at this point in the history
  • Loading branch information
perfectra1n committed Jan 23, 2025
1 parent 1fc6063 commit ecbfa28
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/services/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ const defaultConfig = {
// We prefer the environment variables over the ini file's values here, so that the user can "override" the values as needed.
const config = {
General: {
instanceName: process.env.TRILIUM_INSTANCENAME || iniConfig.General.instanceName || defaultConfig.General.instanceName,
noAuthentication: process.env.TRILIUM_NOAUTHENTICATION || iniConfig.General.noAuthentication || defaultConfig.General.noAuthentication,
noBackup: process.env.TRILIUM_NOBACKUP || iniConfig.General.noBackup || defaultConfig.General.noBackup,
noDesktopIcon: process.env.TRILIUM_NODESKTOPICON || iniConfig.General.noDesktopIcon || defaultConfig.General.noDesktopIcon,
instanceName: process.env.TRILIUM_GENERAL_INSTANCENAME || iniConfig.General.instanceName || defaultConfig.General.instanceName,
noAuthentication: process.env.TRILIUM_GENERAL_NOAUTHENTICATION || iniConfig.General.noAuthentication || defaultConfig.General.noAuthentication,
noBackup: process.env.TRILIUM_GENERAL_NOBACKUP || iniConfig.General.noBackup || defaultConfig.General.noBackup,
noDesktopIcon: process.env.TRILIUM_GENERAL_NODESKTOPICON || iniConfig.General.noDesktopIcon || defaultConfig.General.noDesktopIcon,
},
Network: {
host: process.env.TRILIUM_HOST || iniConfig.Network.host || defaultConfig.Network.host,
port: process.env.TRILIUM_PORT || iniConfig.Network.port || defaultConfig.Network.port,
https: process.env.TRILIUM_HTTPS || iniConfig.Network.https || defaultConfig.Network.https,
certPath: process.env.TRILIUM_CERTPATH || iniConfig.Network.certPath || defaultConfig.Network.certPath,
keyPath: process.env.TRILIUM_KEYPATH || iniConfig.Network.keyPath || defaultConfig.Network.keyPath,
trustedReverseProxy: process.env.TRILIUM_TRUSTEDREVERSEPROXY || iniConfig.Network.trustedReverseProxy || defaultConfig.Network.trustedReverseProxy,
host: process.env.TRILIUM_NETWORK_HOST || iniConfig.Network.host || defaultConfig.Network.host,
port: process.env.TRILIUM_NETWORK_PORT || iniConfig.Network.port || defaultConfig.Network.port,
https: process.env.TRILIUM_NETWORK_HTTPS || iniConfig.Network.https || defaultConfig.Network.https,
certPath: process.env.TRILIUM_NETWORK_CERTPATH || iniConfig.Network.certPath || defaultConfig.Network.certPath,
keyPath: process.env.TRILIUM_NETWORK_KEYPATH || iniConfig.Network.keyPath || defaultConfig.Network.keyPath,
trustedReverseProxy: process.env.TRILIUM_NETWORK_TRUSTEDREVERSEPROXY || iniConfig.Network.trustedReverseProxy || defaultConfig.Network.trustedReverseProxy,
},
Sync: {
syncServerHost: process.env.TRILIUM_SYNCSERVERHOST || iniConfig.Sync.syncServerHost || defaultConfig.Sync.syncServerHost,
syncServerTimeout: process.env.TRILIUM_SYNCSERVERTIMEOUT || iniConfig.Sync.syncServerTimeout || defaultConfig.Sync.syncServerTimeout,
syncProxy: process.env.TRILIUM_SYNCPROXY || iniConfig.Sync.syncProxy || defaultConfig.Sync.syncProxy,
syncServerHost: process.env.TRILIUM_SYNC_SYNCSERVERHOST || iniConfig.Sync.syncServerHost || defaultConfig.Sync.syncServerHost,
syncServerTimeout: process.env.TRILIUM_SYNC_SYNCSERVERTIMEOUT || iniConfig.Sync.syncServerTimeout || defaultConfig.Sync.syncServerTimeout,
syncProxy: process.env.TRILIUM_SYNC_SYNCPROXY || iniConfig.Sync.syncProxy || defaultConfig.Sync.syncProxy,
}
}

Expand Down

0 comments on commit ecbfa28

Please sign in to comment.