From 6a3c3e7215ca90c09443a1807828091a4d1c0e7d Mon Sep 17 00:00:00 2001 From: William Durand Date: Wed, 24 Dec 2014 02:17:41 +0100 Subject: [PATCH] Fix checkstyle --- .jshintignore | 1 + lib/config/config.js | 7 ++++++- lib/config/defaults.js | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .jshintignore diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000..26217e8 --- /dev/null +++ b/.jshintignore @@ -0,0 +1 @@ +bin/hipache diff --git a/lib/config/config.js b/lib/config/config.js index 5fa8a34..72e896f 100644 --- a/lib/config/config.js +++ b/lib/config/config.js @@ -106,7 +106,12 @@ https.bind = https.bind.map(function (item) { item = (item instanceof Object) ? item : {address: item}; // For each address, inherit global settings if not explicitly specified - ['port', 'key', 'cert', 'ca', 'ciphers', 'secureProtocol', 'honorCipherOrder', 'secureOptions'].forEach(function (key) { + [ + 'port', + 'key', 'cert', 'ca', + 'ciphers', 'honorCipherOrder', + 'secureProtocol', 'secureOptions' + ].forEach(function (key) { item[key] = item[key] || https[key]; }); // If we share the same key as global, have the passphrase as well, unless overridden diff --git a/lib/config/defaults.js b/lib/config/defaults.js index d9f5fca..292bab7 100644 --- a/lib/config/defaults.js +++ b/lib/config/defaults.js @@ -22,6 +22,7 @@ // No CA provided ca: [], secureProtocol: "SSLv23_method", + /*jshint camelcase:false*/ secureOptions: constants.SSL_OP_NO_SSLv3 | constants.SSL_OP_NO_SSLv2 },