From afa1b858ba275e765eedf8a0ea566680fc79e25e Mon Sep 17 00:00:00 2001 From: ylianst Date: Wed, 6 Nov 2019 02:49:40 -0800 Subject: [PATCH] Fixed GreenLock install. --- meshcentral.js | 5 ++++- package.json | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meshcentral.js b/meshcentral.js index 4195b8fc..077c21fc 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -1949,6 +1949,9 @@ function InstallModule(modulename, func, tag1, tag2) { var child_process = require('child_process'); var parentpath = __dirname; + // Add module exact version number if needed + if (modulename == 'greenlock') { modulename = 'greenlock@2.8.8'; } + // Get the working directory if ((__dirname.endsWith('/node_modules/meshcentral')) || (__dirname.endsWith('\\node_modules\\meshcentral')) || (__dirname.endsWith('/node_modules/meshcentral/')) || (__dirname.endsWith('\\node_modules\\meshcentral\\'))) { parentpath = require('path').join(__dirname, '../..'); } @@ -2006,7 +2009,7 @@ function mainStart() { var modules = ['ws', 'cbor', 'nedb', 'https', 'yauzl', 'xmldom', 'ipcheck', 'express', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'cookie-session', 'express-handlebars']; if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules if (ldap == true) { modules.push('ldapauth-fork'); } - if (config.letsencrypt != null) { modules.push('greenlock@2.8.8'); modules.push('le-store-certbot'); modules.push('le-challenge-fs'); modules.push('le-acme-core'); } // Add Greenlock Modules + if (config.letsencrypt != null) { modules.push('greenlock'); modules.push('le-store-certbot'); modules.push('le-challenge-fs'); modules.push('le-acme-core'); } // Add Greenlock Modules if (config.settings.mqtt != null) { modules.push('aedes'); } // Add MQTT Modules if (config.settings.mongodb != null) { modules.push('mongodb'); } // Add MongoDB, official driver. if (config.settings.vault != null) { modules.push('node-vault'); } // Add official HashiCorp's Vault module. diff --git a/package.json b/package.json index 0ca3d379..3a27c6dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.3-v", + "version": "0.4.3-w", "keywords": [ "Remote Management", "Intel AMT", @@ -37,8 +37,10 @@ "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", + "greenlock": "^2.8.8", "html-minifier": "^4.0.0", "ipcheck": "^0.1.0", + "le-acme-core": "^2.1.4", "meshcentral": "*", "minify-js": "0.0.4", "minimist": "^1.2.0",