Skip to content

Commit

Permalink
Fix checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Dec 24, 2014
1 parent 957e4e8 commit 6a3c3e7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions .jshintignore
@@ -0,0 +1 @@
bin/hipache
7 changes: 6 additions & 1 deletion lib/config/config.js
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/config/defaults.js
Expand Up @@ -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
},

Expand Down

0 comments on commit 6a3c3e7

Please sign in to comment.