diff options
| author | Christoph (Sheogorath) Kern | 2018-01-18 11:17:17 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-18 11:17:17 +0100 |
| commit | 8375544dea37f385b9851a8cbd1b264911755ae0 (patch) | |
| tree | b63aa2ee5ba87090eb4f2c0f92442467375f9abc | |
| parent | af082d934761cbc72c14293376f7c2df2367e6b7 (diff) | |
| parent | 45976a8916ff2da60bdfb98841f7394fd2659ae7 (diff) | |
Merge pull request #636 from laysdra7265/fix/sslcapath
Fix sslcapath bug
| -rw-r--r-- | lib/config/defaultSSL.js | 2 | ||||
| -rw-r--r-- | lib/config/index.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/config/defaultSSL.js b/lib/config/defaultSSL.js index 1f1d5590..362c62a1 100644 --- a/lib/config/defaultSSL.js +++ b/lib/config/defaultSSL.js @@ -12,6 +12,6 @@ function getFile (path) { module.exports = { sslkeypath: getFile('/run/secrets/key.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') } diff --git a/lib/config/index.js b/lib/config/index.js index 3ac3de53..a14f3197 100644 --- a/lib/config/index.js +++ b/lib/config/index.js @@ -96,7 +96,10 @@ config.isSAMLEnable = config.saml.idpSsoUrl config.isPDFExportEnable = config.allowpdfexport // 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.sslkeypath = path.join(appRootPath, config.sslkeypath) config.dhparampath = path.join(appRootPath, config.dhparampath) |