@root/greenlock - npm Package Compare versions

Comparing version 3.0.7 to 3.0.8

greenlock.js

@@ -36,3 +36,3 @@ 'use strict';
 			'invalid maintainer contact info:',
-			gconf.maintainer.Email
+			gconf.maintainerEmail
 		);
@@ -219,13 +219,13 @@ // maybe a little harsh?
 				/*
-				// maintainer should be only on pre-publish, or maybe install, I think
-				maintainerEmail: greenlock._defaults._maintainerEmail,
-				name: greenlock._defaults._maintainerPackage,
-				version: greenlock._defaults._maintainerPackageVersion,
-				//action: params.pems._type,
-				domains: params.altnames,
-				subscriberEmail: greenlock._defaults._subscriberEmail,
-				// TODO enable for Greenlock Pro
-				//customerEmail: args.customerEmail
-				telemetry: greenlock._defaults.telemetry
-        */
+                // maintainer should be only on pre-publish, or maybe install, I think
+                maintainerEmail: greenlock._defaults._maintainerEmail,
+                name: greenlock._defaults._packageAgent,
+                version: greenlock._defaults._maintainerPackageVersion,
+                //action: params.pems._type,
+                domains: params.altnames,
+                subscriberEmail: greenlock._defaults._subscriberEmail,
+                // TODO enable for Greenlock Pro
+                //customerEmail: args.customerEmail
+                telemetry: greenlock._defaults.telemetry
+                */
 			});
@@ -316,9 +316,15 @@ }
 				site = JSON.parse(JSON.stringify(site));
-				if (!site.store) {
-					site.store = greenlock._defaults.store;
+				if (site.store && site.challenges) {
+					return site;
 				}
-				if (!site.challenges) {
-					site.challenges = greenlock._defaults.challenges;
-				}
-				return site;
+				return greenlock.manager.defaults().then(function(mconf) {
+					if (!site.store) {
+						site.store = mconf.store || greenlock._defaults.store;
+					}
+					if (!site.challenges) {
+						site.challenges =
+							mconf.challenges || greenlock._defaults.challenges;
+					}
+					return site;
+				});
 			});
@@ -402,5 +408,10 @@ };
 	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({
 			maintainerEmail: greenlock._defaults.maintainerEmail,
-			packageAgent: greenlock._defaults.packageAgent,
+			packageAgent: packageAgent,
 			notify: greenlock._notify,
@@ -522,7 +533,2 @@ debug: greenlock._defaults.debug || args.debug
 
-	if (!defaults._maintainerPackage) {
-		defaults._maintainerPackage = pkg.name;
-		defaults._maintainerPackageVersion = pkg.version;
-	}
-
 	if (!defaults.directoryUrl) {
@@ -529,0 +535,0 @@ if (defaults.staging) {

package.json

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

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

83889

increased by0.47%

Lines of code

2294

increased by0.31%

No dependency changes