root
/
greenlock.js
mirror of https://github.com/therootcompany/greenlock.js.git
2
0
Fork 0
Code Issues 27 Releases Wiki Activity

v2.7.10: allow simpler return from approveDomains

This commit is contained in:
AJ ONeal 2019-04-06 12:34:34 -06:00
parent 90f65a1a63
commit 0cbdf53322
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@ -458,6 +458,14 @@ Greenlock.create = function (gl) {
log(gl.debug, results.options); log(gl.debug, results.options);
var options = results.options || results; var options = results.options || results;
if (opts !== options) {
Object.keys(options).forEach(function (key) {
if ('undefined' !== typeof options[key]) {
opts[key] = options[key];
}
});
options = opts;
}
// just in case we get a completely different object from the one we originally created // just in case we get a completely different object from the one we originally created
if (!options.account) { options.account = {}; } if (!options.account) { options.account = {}; }
if (!options.certificate) { options.certificate = {}; } if (!options.certificate) { options.certificate = {}; }

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.9", "version": "2.7.10",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -46,9 +46,9 @@
} }
}, },
"le-challenge-dns": { "le-challenge-dns": {
"version": "3.0.2", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-3.0.2.tgz", "resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-3.0.3.tgz",
"integrity": "sha512-cmg26G2VdcRL9Ja8JegsES3B2jBTZ/LkkaqzrUAMRl2UQQiS/+kursn3J761ht58/sXOpYVp5V6rQwIXSknDbg==" "integrity": "sha512-6jz9YMpWhTXJKK+Id/S0j8R3oEiH6ya5WBTPzc7GsNR21voesejP7UJaDcdH9GQrjf7gBX3xyr4BlL/GplNBOw=="
}, },
"le-challenge-fs": { "le-challenge-fs": {
"version": "2.0.8", "version": "2.0.8",

6
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.9", "version": "2.7.10",
"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": [
@ -42,10 +42,10 @@
"acme-v2": "^1.7.5", "acme-v2": "^1.7.5",
"cert-info": "^1.5.1", "cert-info": "^1.5.1",
"keypairs": "^1.2.14", "keypairs": "^1.2.14",
"le-challenge-dns": "^3.0.2", "le-challenge-dns": "^3.0.3",
"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.2",
"le-store-fs": "^1.0.2", "le-store-fs": "^1.0.2",
"rsa-compat": "^2.0.6" "rsa-compat": "^2.0.6"
}, },