Compare commits

..

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

4 changed files with 10 additions and 13 deletions

View File

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

View File

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

2
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@root/greenlock",
"version": "3.1.4",
"version": "3.1.3",
"description": "The easiest Let's Encrypt client for Node.js and Browsers",
"homepage": "https://rootprojects.org/greenlock/",
"main": "greenlock.js",