Merge pull request #786 from SISheogorath/fix/compatiblityConfig

Fix some issues with legacy config compatiblity

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/config/defaultSSL.js b/lib/config/defaultSSL.js
index 362c62a1..ba020466 100644
--- a/lib/config/defaultSSL.js
+++ b/lib/config/defaultSSL.js
@@ -10,8 +10,8 @@ function getFile (path) {
 }
 
 module.exports = {
-  sslkeypath: getFile('/run/secrets/key.pem'),
-  sslcertpath: getFile('/run/secrets/cert.pem'),
-  sslcapath: getFile('/run/secrets/ca.pem') !== undefined ? [getFile('/run/secrets/ca.pem')] : [],
-  dhparampath: getFile('/run/secrets/dhparam.pem')
+  sslKeyPath: getFile('/run/secrets/key.pem'),
+  sslCertPath: getFile('/run/secrets/cert.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 fae51e52..cc71564b 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -110,8 +110,8 @@ for (let i = keys.length; i--;) {
   // and the config with uppercase is not set
   // we set the new config using the old key.
   if (uppercase.test(keys[i]) &&
-  config[lowercaseKey] &&
-  !config[keys[1]]) {
+  config[lowercaseKey] !== undefined &&
+  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])
     config[keys[i]] = config[lowercaseKey]
   }