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

Merge pull request #786 from SISheogorath/fix/compatiblityConfig

Browse source 
Fix some issues with legacy config compatiblity
This commit is contained in:
Christoph (Sheogorath) Kern 2018-03-27 19:38:21 +02:00 committed by GitHub
commit 1649a9b742
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/config/defaultSSL.js
View file

@ -10,8 +10,8 @@ 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') !== undefined ? [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')
} }

4
lib/config/index.js
View file

@ -110,8 +110,8 @@ for (let i = keys.length; i--;) {
// and the config with uppercase is not set // and the config with uppercase is not set
// we set the new config using the old key. // we set the new config using the old key.
if (uppercase.test(keys[i]) && if (uppercase.test(keys[i]) &&
config[lowercaseKey] && config[lowercaseKey] !== undefined &&
!config[keys[1]]) { fileConfig[keys[i]] === undefined) {
logger.warn('config.js contains deprecated lowercase setting for ' + keys[i] + '. Please change your config.js file to replace ' + lowercaseKey + ' with ' + keys[i]) logger.warn('config.js contains deprecated lowercase setting for ' + keys[i] + '. Please change your config.js file to replace ' + lowercaseKey + ' with ' + keys[i])
config[keys[i]] = config[lowercaseKey] config[keys[i]] = config[lowercaseKey]
} }