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

v3.0.8: bugfix packageAgent and default challenges / store

This commit is contained in:
AJ ONeal 2019-10-29 18:31:08 +00:00
parent 49a7f2da8f
commit 6665dc3cf8
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
greenlock.js
View File

@ -33,7 +33,7 @@ G.create = function(gconf) {
U._validMx(gconf.maintainerEmail).catch(function() { U._validMx(gconf.maintainerEmail).catch(function() {
console.error( console.error(
'invalid maintainer contact info:', 'invalid maintainer contact info:',
gconf.maintainer.Email gconf.maintainerEmail
); );
// maybe a little harsh? // maybe a little harsh?
process.exit(1); process.exit(1);
@ -217,7 +217,7 @@ G.create = function(gconf) {
/* /*
// maintainer should be only on pre-publish, or maybe install, I think // maintainer should be only on pre-publish, or maybe install, I think
maintainerEmail: greenlock._defaults._maintainerEmail, maintainerEmail: greenlock._defaults._maintainerEmail,
name: greenlock._defaults._maintainerPackage, name: greenlock._defaults._packageAgent,
version: greenlock._defaults._maintainerPackageVersion, version: greenlock._defaults._maintainerPackageVersion,
//action: params.pems._type, //action: params.pems._type,
domains: params.altnames, domains: params.altnames,
@ -311,14 +311,20 @@ G.create = function(gconf) {
} }
var site = sites[0]; var site = sites[0];
site = JSON.parse(JSON.stringify(site)); site = JSON.parse(JSON.stringify(site));
if (site.store && site.challenges) {
return site;
}
return greenlock.manager.defaults().then(function(mconf) {
if (!site.store) { if (!site.store) {
site.store = greenlock._defaults.store; site.store = mconf.store || greenlock._defaults.store;
} }
if (!site.challenges) { if (!site.challenges) {
site.challenges = greenlock._defaults.challenges; site.challenges =
mconf.challenges || greenlock._defaults.challenges;
} }
return site; return site;
}); });
});
}; };
// needs to get info about the renewal, such as which store and challenge(s) to use // needs to get info about the renewal, such as which store and challenge(s) to use
@ -396,9 +402,14 @@ G.create = function(gconf) {
}; };
greenlock._acme = function(args) { greenlock._acme = function(args) {
var packageAgent = greenlock._defaults.packageAgent || '';
// because Greenlock_Express/v3.x Greenlock/v3 is redundant
if (!/greenlock/i.test(packageAgent)) {
packageAgent = (packageAgent + ' Greenlock/' + pkg.version).trim();
}
var acme = ACME.create({ var acme = ACME.create({
maintainerEmail: greenlock._defaults.maintainerEmail, maintainerEmail: greenlock._defaults.maintainerEmail,
packageAgent: greenlock._defaults.packageAgent, packageAgent: packageAgent,
notify: greenlock._notify, notify: greenlock._notify,
debug: greenlock._defaults.debug || args.debug debug: greenlock._defaults.debug || args.debug
}); });
@ -515,11 +526,6 @@ G._defaults = function(opts) {
defaults.find = opts.find; defaults.find = opts.find;
} }
if (!defaults._maintainerPackage) {
defaults._maintainerPackage = pkg.name;
defaults._maintainerPackageVersion = pkg.version;
}
if (!defaults.directoryUrl) { if (!defaults.directoryUrl) {
if (defaults.staging) { if (defaults.staging) {
defaults.directoryUrl = defaults.directoryUrl =

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@root/greenlock", "name": "@root/greenlock",
"version": "3.0.7", "version": "3.0.8",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@root/greenlock", "name": "@root/greenlock",
"version": "3.0.7", "version": "3.0.8",
"description": "The easiest Let's Encrypt client for Node.js and Browsers", "description": "The easiest Let's Encrypt client for Node.js and Browsers",
"homepage": "https://rootprojects.org/greenlock/", "homepage": "https://rootprojects.org/greenlock/",
"main": "greenlock.js", "main": "greenlock.js",