Ver a proveniência

v4.0.4: bugfixes for custom / local manager file

github v4.0.4
AJ ONeal há 4 anos
ascendente
cometimento
6dc711b880
  1. 20
      bin/greenlock.js
  2. 3
      bin/init.js
  3. 32
      lib/manager-wrapper.js
  4. 2
      package-lock.json
  5. 2
      package.json

20
bin/greenlock.js

@ -5,14 +5,20 @@ var args = process.argv.slice(2);
var arg0 = args[0];
//console.log(args);
var found = ['certonly', 'add', 'update', 'config', 'defaults', 'remove', 'init'].some(
function(k) {
if (k === arg0) {
require('./' + k);
return true;
}
var found = [
'certonly',
'add',
'update',
'config',
'defaults',
'remove',
'init'
].some(function(k) {
if (k === arg0) {
require('./' + k);
return true;
}
);
});
if (!found) {
console.error(arg0 + ': command not yet implemented');

3
bin/init.js

@ -36,6 +36,9 @@ cli.main(async function(argList, flags) {
flags.manager.module = manager;
try {
if ('.' === String(manager)[0]) {
manager = require('path').resolve(pkgRoot, manager);
}
P._loadSync(manager);
} catch (e) {
try {

32
lib/manager-wrapper.js

@ -12,13 +12,25 @@ module.exports.wrap = function(greenlock, gconf) {
var myFind = gconf.find;
delete gconf.find;
var mega = mergeManager(gconf);
var mega = mergeManager(greenlock, gconf);
greenlock.manager = {};
greenlock.sites = {};
//greenlock.accounts = {};
//greenlock.certs = {};
greenlock.manager._modulename = gconf.manager.module;
if ('/' === String(gconf.manager.module)[0]) {
greenlock.manager._modulename = require('path').relative(
gconf.packageRoot,
greenlock.manager._modulename
);
if ('.' !== String(greenlock.manager._modulename)[0]) {
greenlock.manager._modulename =
'./' + greenlock.manager._modulename;
}
}
var allowed = [
'accountKeyType', //: ["P-256", "RSA-2048"],
'serverKeyType', //: ["RSA-2048", "P-256"],
@ -409,6 +421,7 @@ function loadManager(gconf) {
);
}
*/
try {
// wrap this to be safe for @greenlock/manager
m = require(gconf.manager.module).create(gconf.manager);
@ -431,7 +444,7 @@ function loadManager(gconf) {
return m;
}
function mergeManager(gconf) {
function mergeManager(greenlock, gconf) {
var mng;
function m() {
if (mng) {
@ -554,6 +567,21 @@ function mergeManager(gconf) {
mega.get = m().get;
}
if (!mega.find) {
mega._nofind = false;
mega.find = async function(opts) {
if (!mega._nofind) {
console.warn(
'Warning: manager `' +
greenlock.manager._modulename +
'` does not implement `find({})`\n'
);
mega._nofind = true;
}
return [];
};
}
if (!mega.get) {
mega.get = function(opts) {
var servername = opts.servername;

2
package-lock.json

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

2
package.json

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

Carregando…
Cancelar
Guardar