Compare commits
No commits in common. "fcafde98be1c9fe903f3e8b6ba8ac2b8355a28ba" and "d6c7da17d84f322c7ebd16c22a3766cc3adf3424" have entirely different histories.
fcafde98be
...
d6c7da17d8
17
greenlock.js
17
greenlock.js
|
@ -405,8 +405,7 @@ G.create = function(gconf) {
|
||||||
showDir = true;
|
showDir = true;
|
||||||
dirUrl = greenlock._defaults.directoryUrl;
|
dirUrl = greenlock._defaults.directoryUrl;
|
||||||
}
|
}
|
||||||
if (showDir || (/staging/.test(dirUrl) && !gdefaults.shownDirectory)) {
|
if (showDir || /staging/.test(dirUrl)) {
|
||||||
gdefaults.shownDirectory = true;
|
|
||||||
console.info('ACME Directory URL:', gdefaults.directoryUrl);
|
console.info('ACME Directory URL:', gdefaults.directoryUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -447,15 +446,13 @@ 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 = path.resolve(
|
||||||
storeConf.basePath = 'greenlock';
|
gconf.packageRoot || process.cwd(),
|
||||||
|
'greenlock'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
storeConf.basePath = path.resolve(
|
|
||||||
gconf.packageRoot || process.cwd(),
|
|
||||||
storeConf.basePath
|
|
||||||
);
|
|
||||||
return P._loadStore(storeConf).then(function(store) {
|
return P._loadStore(storeConf).then(function(store) {
|
||||||
return A._getOrCreate(
|
return A._getOrCreate(
|
||||||
greenlock,
|
greenlock,
|
||||||
|
|
|
@ -162,7 +162,7 @@ module.exports._read = function(pkgdir) {
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
require(path.resolve(path.join(pkgdir, './package.json')));
|
require(path.join(pkgdir, 'package.json'));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
e.context = 'package.json';
|
e.context = 'package.json';
|
||||||
e.desc =
|
e.desc =
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@root/greenlock",
|
"name": "@root/greenlock",
|
||||||
"version": "3.1.4",
|
"version": "3.1.3",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@root/greenlock",
|
"name": "@root/greenlock",
|
||||||
"version": "3.1.4",
|
"version": "3.1.3",
|
||||||
"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",
|
||||||
|
|
Loading…
Reference in New Issue