depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #636 from laysdra7265/fix/sslcapath

Browse source 
Fix sslcapath bug
This commit is contained in:
Christoph (Sheogorath) Kern 2018-01-18 11:17:17 +01:00 committed by GitHub
commit 8375544dea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config/defaultSSL.js
View file

@ -12,6 +12,6 @@ function getFile (path) {
module.exports = { module.exports = {
sslkeypath: getFile('/run/secrets/key.pem'), sslkeypath: getFile('/run/secrets/key.pem'),
sslcertpath: getFile('/run/secrets/cert.pem'), sslcertpath: getFile('/run/secrets/cert.pem'),
sslcapath: getFile('/run/secrets/ca.pem'), sslcapath: getFile('/run/secrets/ca.pem') !== undefined ? [getFile('/run/secrets/ca.pem')] : [],
dhparampath: getFile('/run/secrets/dhparam.pem') dhparampath: getFile('/run/secrets/dhparam.pem')
} }

5
lib/config/index.js
View file

@ -96,7 +96,10 @@ config.isSAMLEnable = config.saml.idpSsoUrl
config.isPDFExportEnable = config.allowpdfexport config.isPDFExportEnable = config.allowpdfexport
// generate correct path // generate correct path
config.sslcapath = path.join(appRootPath, config.sslcapath) config.sslcapath.forEach(function (capath, i, array) {
array[i] = path.resolve(appRootPath, capath)
})
config.sslcertpath = path.join(appRootPath, config.sslcertpath) config.sslcertpath = path.join(appRootPath, config.sslcertpath)
config.sslkeypath = path.join(appRootPath, config.sslkeypath) config.sslkeypath = path.join(appRootPath, config.sslkeypath)
config.dhparampath = path.join(appRootPath, config.dhparampath) config.dhparampath = path.join(appRootPath, config.dhparampath)