coolaj86/greenlock.js
1
0
Fork 0
mirror of https://github.com/therootcompany/greenlock.js.git synced 2024-11-16 17:29:00 +00:00
Code Projects Releases Wiki Activity

v3.1.4: bugfix basePath for issue #13

Browse Source
This commit is contained in:
AJ ONeal 2019-11-05 15:38:08 -07:00
parent d6c7da17d8
commit 9ea7961bb6
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
greenlock.js
View File

@ -405,7 +405,8 @@ G.create = function(gconf) {
showDir = true; showDir = true;
dirUrl = greenlock._defaults.directoryUrl; dirUrl = greenlock._defaults.directoryUrl;
} }
if (showDir || /staging/.test(dirUrl)) { if (showDir || (/staging/.test(dirUrl) && !gdefaults.shownDirectory)) {
gdefaults.shownDirectory = true;
console.info('ACME Directory URL:', gdefaults.directoryUrl); console.info('ACME Directory URL:', gdefaults.directoryUrl);
} }
@ -446,13 +447,15 @@ G.create = function(gconf) {
var storeConf = siteConf.store || mconf.store; var storeConf = siteConf.store || mconf.store;
storeConf = JSON.parse(JSON.stringify(storeConf)); storeConf = JSON.parse(JSON.stringify(storeConf));
storeConf.packageRoot = gconf.packageRoot; storeConf.packageRoot = gconf.packageRoot;
if (storeConf.basePath) {
var path = require('path'); var path = require('path');
if (!storeConf.basePath) {
storeConf.basePath = 'greenlock';
}
storeConf.basePath = path.resolve( storeConf.basePath = path.resolve(
gconf.packageRoot || process.cwd(), gconf.packageRoot || process.cwd(),
'greenlock' storeConf.basePath
); );
}
return P._loadStore(storeConf).then(function(store) { return P._loadStore(storeConf).then(function(store) {
return A._getOrCreate( return A._getOrCreate(
greenlock, greenlock,

2
greenlockrc.js
View File

@ -162,7 +162,7 @@ module.exports._read = function(pkgdir) {
throw err; throw err;
} }
try { try {
require(path.join(pkgdir, 'package.json')); require(path.resolve(path.join(pkgdir, './package.json')));
} catch (e) { } catch (e) {
e.context = 'package.json'; e.context = 'package.json';
e.desc = e.desc =

2
package.json
View File

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