Fixed sample config.json file.

This commit is contained in:
Ylian Saint-Hilaire 2019-02-11 22:09:46 -08:00
parent 23973cd8ce
commit 518d4d1017
5 changed files with 5 additions and 7 deletions

View File

@ -112,8 +112,6 @@ module.exports.CertificateOperations = function (parent) {
// Create a self-signed certificate
obj.GenerateRootCertificate = function (addThumbPrintToName, commonName, country, organization, strong) {
// TODO: Use Async key generation to use web workers and go a lot faster.
// rsa.generateKeyPair({ bits: 3072, e: 0x10001, workers: -1 }, function (err, keypair) { /*keypair.privateKey, keypair.publicKey*/ });
var keys = obj.pki.rsa.generateKeyPair({ bits: (strong == true) ? 3072 : 2048, e: 0x10001 });
var cert = obj.pki.createCertificate();
cert.publicKey = keys.publicKey;

View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "0.2.7-x",
"version": "0.2.7-y",
"keywords": [
"Remote Management",
"Intel AMT",

View File

@ -46,7 +46,7 @@
"MaxUserSessions": 100,
"MaxAgentSessions": 100
},
"_yubikey": { "id": "0000", "secret": "xxxxxxxxxxxxxxxxxxxxx", "_proxy": "http://myproxy.domain.com:80" },
"_yubikey": { "id": "0000", "secret": "xxxxxxxxxxxxxxxxxxxxx", "_proxy": "http://myproxy.domain.com:80" }
},
"customer1": {
"DNS": "customer1.myserver.com",

File diff suppressed because one or more lines are too long

View File

@ -1597,8 +1597,8 @@
r += '<div><div colspan=3 class=DevSt><span style=float:right>';
//r += getMeshActions(mesh, meshrights);
r += '</span><span id=MxMESH style=cursor:pointer onclick=goForward("' + mesh._id + '")>' + EscapeHtml(mesh.name) + '</span></div>';
if (mesh.mtype == 1) { r += '<div style=padding:10px><i>No Intel&reg; AMT devices in this mesh'; }
if (mesh.mtype == 2) { r += '<div style=padding:10px><i>No devices in this mesh'; }
if (mesh.mtype == 1) { r += '<div style=padding:10px><i>No Intel&reg; AMT devices in this group'; }
if (mesh.mtype == 2) { r += '<div style=padding:10px><i>No devices in this group'; }
r += '.</i></div></div>';
current = mesh._id;
count++;