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

v2.7.8: burn some logs, ensure account and certificate objects

This commit is contained in:
AJ ONeal 2019-04-04 22:18:07 -06:00
parent 593c2d5fca
commit 082f0e4522
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@ -426,13 +426,19 @@ Greenlock.create = function (gl) {
gl.getCertificates = function (domain, certs, cb) { gl.getCertificates = function (domain, certs, cb) {
// certs come from current in-memory cache, not lookup // certs come from current in-memory cache, not lookup
log(gl.debug, 'gl.getCertificates called for', domain, 'with certs for', certs && certs.altnames || 'NONE'); log(gl.debug, 'gl.getCertificates called for', domain, 'with certs for', certs && certs.altnames || 'NONE');
var opts = { domain: domain, domains: certs && certs.altnames || [ domain ], certs: certs }; var opts = {
domain: domain, domains: certs && certs.altnames || [ domain ]
, certs: certs, certificate: {}, account: {}
};
function cb2(results) { function cb2(results) {
log(gl.debug, 'gl.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:'); log(gl.debug, 'gl.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:');
log(gl.debug, results.options); log(gl.debug, results.options);
var options = results.options || results; var options = results.options || results;
// just in case we get a completely different object from the one we originally created
if (!options.account) { options.account = {}; }
if (!options.certificate) { options.certificate = {}; }
if (results.certs) { if (results.certs) {
log(gl.debug, 'gl renewing'); log(gl.debug, 'gl renewing');
return gl.core.certificates.renewAsync(options, results.certs).then( return gl.core.certificates.renewAsync(options, results.certs).then(

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.6", "version": "2.7.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -74,9 +74,9 @@
} }
}, },
"le-store-fs": { "le-store-fs": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/le-store-fs/-/le-store-fs-1.0.1.tgz", "resolved": "https://registry.npmjs.org/le-store-fs/-/le-store-fs-1.0.2.tgz",
"integrity": "sha512-5/Q4mfPGXlmki3ccPar796oNkZ21bJCY/AAHmqjKlHBUF2Ck1hlnaADP/2nQFK4UNzPACVAgvZSv/f1rZYvwdA==", "integrity": "sha512-9Xm9Lro0qCJMSdsR2496lqu+VjjRUC0Rz3BYGpgVbWb+9+4wyLk+Gq76q3nI3UzrpDxcqhR+Jh1FDxsRowKmmg==",
"requires": { "requires": {
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"safe-replace": "^1.1.0" "safe-replace": "^1.1.0"

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.7", "version": "2.7.8",
"description": "Let's Encrypt for node.js on npm", "description": "Let's Encrypt for node.js on npm",
"main": "index.js", "main": "index.js",
"files": [ "files": [
@ -46,7 +46,7 @@
"le-challenge-fs": "^2.0.2", "le-challenge-fs": "^2.0.2",
"le-sni-auto": "^2.1.8", "le-sni-auto": "^2.1.8",
"le-store-certbot": "^2.2.1", "le-store-certbot": "^2.2.1",
"le-store-fs": "^1.0.1", "le-store-fs": "^1.0.2",
"rsa-compat": "^2.0.6" "rsa-compat": "^2.0.6"
}, },
"engines": { "engines": {