external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Merged APF and MPS servers, improved APF client.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2020-10-08 19:47:24 -07:00
parent 3ff007c8d8
commit bc4e07b5fe
8 changed files with 495 additions and 1242 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshcentral.js
View file

@ -26,7 +26,6 @@ function CreateMeshCentralServer(config, args) {
obj.webserver = null;
obj.redirserver = null;
obj.mpsserver = null;
obj.apfserver = null;
obj.mqttbroker = null;
obj.swarmserver = null;
obj.mailserver = null;
@ -1318,9 +1317,6 @@ function CreateMeshCentralServer(config, args) {
if ((obj.args.sessiontime != null) && ((typeof obj.args.sessiontime != 'number') || (obj.args.sessiontime < 1))) { delete obj.args.sessiontime; }
if (!obj.args.sessionkey) { obj.args.sessionkey = buf.toString('hex').toUpperCase(); }
// Create APF server to hook into webserver
obj.apfserver = require('./apfserver.js').CreateApfServer(obj, obj.db, obj.args);
// Create MQTT Broker to hook into webserver and mpsserver
if ((typeof obj.config.settings.mqtt == 'object') && (typeof obj.config.settings.mqtt.auth == 'object') && (typeof obj.config.settings.mqtt.auth.keyid == 'string') && (typeof obj.config.settings.mqtt.auth.key == 'string')) { obj.mqttbroker = require("./mqttbroker.js").CreateMQTTBroker(obj, obj.db, obj.args); }