Compare commits

..

No commits in common. "bd817d2a244b90db9c6efaee643b5e8ab3f714d3" and "fcafde98be1c9fe903f3e8b6ba8ac2b8355a28ba" have entirely different histories.

3 changed files with 4 additions and 10 deletions

View File

@ -399,21 +399,15 @@ G.create = function(gconf) {
notify: greenlock._notify, notify: greenlock._notify,
debug: greenlock._defaults.debug || args.debug debug: greenlock._defaults.debug || args.debug
}); });
// The user has explicitly set the directoryUrl, great!
var dirUrl = args.directoryUrl || mconf.directoryUrl; var dirUrl = args.directoryUrl || mconf.directoryUrl;
// The directoryUrl is implicit
var showDir = false; var showDir = false;
if (!dirUrl) { if (!dirUrl) {
showDir = true; showDir = true;
dirUrl = greenlock._defaults.directoryUrl; dirUrl = greenlock._defaults.directoryUrl;
} }
if (showDir || (/staging/.test(dirUrl) && !gdefaults.shownDirectory)) {
// Show the directory if implicit
if (showDir && !gdefaults.shownDirectory) {
gdefaults.shownDirectory = true; gdefaults.shownDirectory = true;
console.info('ACME Directory URL:', dirUrl); console.info('ACME Directory URL:', gdefaults.directoryUrl);
} }
var dir = caches[dirUrl]; var dir = caches[dirUrl];

2
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "@root/greenlock", "name": "@root/greenlock",
"version": "3.1.5", "version": "3.1.4",
"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",