coolaj86
/
greenlock.js
mirror of https://github.com/therootcompany/greenlock.js.git
1
0
Fork 0
Code Projects Releases Wiki Activity

log whitespace and servername

This commit is contained in:
AJ ONeal 2019-11-29 16:58:40 -07:00
parent 1ce3964aab
commit c945da9b48
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
greenlock.js
View File

@ -94,7 +94,7 @@ G.create = function(gconf) {
// greenlock.challenges.get // greenlock.challenges.get
ChWrapper.wrap(greenlock); ChWrapper.wrap(greenlock);
DIR._getDefaultDirectoryUrl('', gconf.staging); DIR._getDefaultDirectoryUrl('', gconf.staging, '');
if (gconf.directoryUrl) { if (gconf.directoryUrl) {
gdefaults.directoryUrl = gconf.directoryUrl; gdefaults.directoryUrl = gconf.directoryUrl;
} }
@ -388,7 +388,8 @@ G.create = function(gconf) {
}); });
var dirUrl = DIR._getDirectoryUrl( var dirUrl = DIR._getDirectoryUrl(
args.directoryUrl || mconf.directoryUrl args.directoryUrl || mconf.directoryUrl,
args.servername
); );
var dir = caches[dirUrl]; var dir = caches[dirUrl];

9
lib/directory-url.js
View File

@ -1,9 +1,9 @@
var DIR = module.exports; var DIR = module.exports;
// This will ALWAYS print out a notice if the URL is clearly a staging URL // This will ALWAYS print out a notice if the URL is clearly a staging URL
DIR._getDirectoryUrl = function(dirUrl) { DIR._getDirectoryUrl = function(dirUrl, domain) {
var liveUrl = 'https://acme-v02.api.letsencrypt.org/directory'; var liveUrl = 'https://acme-v02.api.letsencrypt.org/directory';
dirUrl = DIR._getDefaultDirectoryUrl(dirUrl); dirUrl = DIR._getDefaultDirectoryUrl(dirUrl, '', domain);
if (!dirUrl) { if (!dirUrl) {
dirUrl = liveUrl; dirUrl = liveUrl;
// This will print out a notice (just once) if no directoryUrl has been supplied // This will print out a notice (just once) if no directoryUrl has been supplied
@ -16,7 +16,7 @@ DIR._getDirectoryUrl = function(dirUrl) {
}; };
// Handle staging URLs, pebble test server, etc // Handle staging URLs, pebble test server, etc
DIR._getDefaultDirectoryUrl = function(dirUrl, staging) { DIR._getDefaultDirectoryUrl = function(dirUrl, staging, domain) {
var stagingUrl = 'https://acme-staging-v02.api.letsencrypt.org/directory'; var stagingUrl = 'https://acme-staging-v02.api.letsencrypt.org/directory';
var stagingRe = /(^http:|staging|^127\.0\.|^::|localhost)/; var stagingRe = /(^http:|staging|^127\.0\.|^::|localhost)/;
var env = ''; var env = '';
@ -36,8 +36,7 @@ DIR._getDefaultDirectoryUrl = function(dirUrl, staging) {
dirUrl = stagingUrl; dirUrl = stagingUrl;
} }
console.info('[staging] ACME Staging Directory URL:', dirUrl, env); console.info('[staging] ACME Staging Directory URL:', dirUrl, env);
console.warn(''); console.warn('FAKE CERTIFICATES (for testing) only', env, domain);
console.warn('FAKE CERTIFICATES (for testing) only', env);
console.warn(''); console.warn('');
} }