Skip to content

Commit 556783f

Browse files
committed
lib/config: use path.resolve instead of path.join
While paths like `tmpPath` could previously be configured, they were all interpreted relative to `appRootPath` because of `path.join`. Now the configurable paths can be canonical and therefore independent of the `appRootPath`. Signed-off-by: WilliButz <[email protected]>
1 parent e48852e commit 556783f

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

lib/config/index.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,20 +174,20 @@ config.sslCAPath.forEach(function (capath, i, array) {
174174
array[i] = path.resolve(appRootPath, capath)
175175
})
176176

177-
config.sslCertPath = path.join(appRootPath, config.sslCertPath)
178-
config.sslKeyPath = path.join(appRootPath, config.sslKeyPath)
179-
config.dhParamPath = path.join(appRootPath, config.dhParamPath)
180-
181-
config.tmpPath = path.join(appRootPath, config.tmpPath)
182-
config.defaultNotePath = path.join(appRootPath, config.defaultNotePath)
183-
config.docsPath = path.join(appRootPath, config.docsPath)
184-
config.indexPath = path.join(appRootPath, config.indexPath)
185-
config.codimdPath = path.join(appRootPath, config.codimdPath)
186-
config.errorPath = path.join(appRootPath, config.errorPath)
187-
config.prettyPath = path.join(appRootPath, config.prettyPath)
188-
config.slidePath = path.join(appRootPath, config.slidePath)
189-
config.constantsPath = path.join(appRootPath, config.constantsPath)
190-
config.uploadsPath = path.join(appRootPath, config.uploadsPath)
177+
config.sslCertPath = path.resolve(appRootPath, config.sslCertPath)
178+
config.sslKeyPath = path.resolve(appRootPath, config.sslKeyPath)
179+
config.dhParamPath = path.resolve(appRootPath, config.dhParamPath)
180+
181+
config.tmpPath = path.resolve(appRootPath, config.tmpPath)
182+
config.defaultNotePath = path.resolve(appRootPath, config.defaultNotePath)
183+
config.docsPath = path.resolve(appRootPath, config.docsPath)
184+
config.indexPath = path.resolve(appRootPath, config.indexPath)
185+
config.codimdPath = path.resolve(appRootPath, config.codimdPath)
186+
config.errorPath = path.resolve(appRootPath, config.errorPath)
187+
config.prettyPath = path.resolve(appRootPath, config.prettyPath)
188+
config.slidePath = path.resolve(appRootPath, config.slidePath)
189+
config.constantsPath = path.resolve(appRootPath, config.constantsPath)
190+
config.uploadsPath = path.resolve(appRootPath, config.uploadsPath)
191191

192192
// make config readonly
193193
config = deepFreeze(config)

0 commit comments

Comments
 (0)