coolaj86
/
greenlock.js-ARCHIVED
3
3
Fork 0
Code Issues 6 Pull Requests 1 Releases Activity

Merge branch 'v2'

This commit is contained in:
AJ ONeal 2018-05-12 16:48:36 -06:00
parent 568af88d29 039e4b122b
commit 653fd0f349
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.js
View File

@ -321,9 +321,7 @@ LE.create = function (le) {
} }
}; };
} }
if (!le.tlsOptions.key || !le.tlsOptions.cert) {
le.tlsOptions = require('localhost.daplie.me-certificates').merge(le.tlsOptions);
}
// We want to move to using tlsOptions instead of httpsOptions, but we also need to make // We want to move to using tlsOptions instead of httpsOptions, but we also need to make
// sure anything that uses this object will still work if looking for httpsOptions. // sure anything that uses this object will still work if looking for httpsOptions.
le.httpsOptions = le.tlsOptions; le.httpsOptions = le.tlsOptions;

1
package.json
View File

@ -70,7 +70,6 @@
"le-challenge-sni": "^2.0.0", "le-challenge-sni": "^2.0.0",
"le-sni-auto": "^2.1.3", "le-sni-auto": "^2.1.3",
"le-store-certbot": "^2.0.3", "le-store-certbot": "^2.0.3",
"localhost.daplie.me-certificates": "^1.3.0",
"node.extend": "^1.1.5", "node.extend": "^1.1.5",
"pkijs": "^1.3.27", "pkijs": "^1.3.27",
"rsa-compat": "^1.2.1" "rsa-compat": "^1.2.1"