From 0ebc958305df22f0c21cdf3b186ef6643696894e Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 29 Oct 2019 10:23:54 +0000 Subject: [PATCH] v0.6.5: return all on find({}), bugfix match --- manager.js | 12 ++++++++---- package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/manager.js b/manager.js index 365a9a4..5ffac42 100644 --- a/manager.js +++ b/manager.js @@ -131,7 +131,7 @@ Manage.create = function(opts) { altnames .slice(0) .sort() - .join(' ') !== site.altnames.slice(0).sort.join(' ') + .join(' ') !== site.altnames.slice(0).sort().join(' ') ) { // TODO signal to wait for renewal? // it will definitely be renewed on the first request anyway @@ -266,6 +266,7 @@ Manage.create = function(opts) { //args.expiresBefore = Date.now() + 45 * 24 * 60 * 60 * 1000; var issuedBefore = args.issuedBefore || Infinity; var expiresBefore = args.expiresBefore || Infinity; //Date.now() + 21 * 24 * 60 * 60 * 1000; + var all = !args.altnames; var altnames = (args.altnames || args.domains || []).slice(0); if (args.servername && !altnames.includes(args.servername)) { @@ -297,9 +298,12 @@ Manage.create = function(opts) { } // altnames, servername, and wildname all get rolled into one - return (site.altnames || []).some(function(name) { - return altnames.includes(name); - }); + return ( + all || + (site.altnames || []).some(function(name) { + return altnames.includes(name); + }) + ); }) .map(function(name) { var site = config.sites[name]; diff --git a/package.json b/package.json index 0efcd06..d492d80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "greenlock-manager-fs", - "version": "0.6.4", + "version": "0.6.5", "description": "A simple file-based management strategy for Greenlock", "main": "manager.js", "scripts": {