From babf6366e898570b1b3b84232f805d22557bc97e Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 18 Jul 2022 21:13:20 +0300 Subject: [PATCH 1/2] chore(install script): use same casing as the json schema --- install.sh | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/install.sh b/install.sh index 4adcf8d2..346195bc 100644 --- a/install.sh +++ b/install.sh @@ -281,34 +281,34 @@ sudo chown ${USER}:${USER} -R /meshcentral meshcfg="$(cat << EOF { "settings": { - "Cert": "${meshdomain}", - "MongoDb": "mongodb://127.0.0.1:27017", - "MongoDbName": "meshcentral", + "cert": "${meshdomain}", + "mongoDb": "mongodb://127.0.0.1:27017", + "mongoDbName": "meshcentral", "WANonly": true, - "Minify": 1, - "Port": 4430, - "AliasPort": 443, - "RedirPort": 800, - "AllowLoginToken": true, - "AllowFraming": true, - "_AgentPing": 60, - "AgentPong": 300, - "AllowHighQualityDesktop": true, - "TlsOffload": "127.0.0.1", + "minify": 1, + "port": 4430, + "aliasPort": 443, + "redirPort": 800, + "allowLoginToken": true, + "allowFraming": true, + "_agentPing": 60, + "agentPong": 300, + "allowHighQualityDesktop": true, + "tlsOffload": "127.0.0.1", "agentCoreDump": false, - "Compression": true, - "WsCompression": true, - "AgentWsCompression": true, - "MaxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 } + "compression": true, + "wsCompression": true, + "agentWsCompression": true, + "maxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 } }, "domains": { "": { - "Title": "Tactical RMM", - "Title2": "Tactical RMM", - "NewAccounts": false, - "CertUrl": "https://${meshdomain}:443/", - "GeoLocation": true, - "CookieIpCheck": false, + "title": "Tactical RMM", + "title2": "Tactical RMM", + "newAccounts": false, + "certUrl": "https://${meshdomain}:443/", + "geoLocation": true, + "cookieIpCheck": false, "mstsc": true } } From 87d05223af4643ec1f2fc18a0994c9846d8ce691 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 18 Jul 2022 22:08:06 +0300 Subject: [PATCH 2/2] apply json fix to docker aswell --- .../tactical-meshcentral/entrypoint.sh | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/containers/tactical-meshcentral/entrypoint.sh b/docker/containers/tactical-meshcentral/entrypoint.sh index f6cec697..f5b9c25b 100644 --- a/docker/containers/tactical-meshcentral/entrypoint.sh +++ b/docker/containers/tactical-meshcentral/entrypoint.sh @@ -27,24 +27,24 @@ if [ ! -f "/home/node/app/meshcentral-data/config.json" ] || [[ "${MESH_PERSISTE { "settings": { "mongodb": "${encoded_uri}", - "Cert": "${MESH_HOST}", - "TLSOffload": "${NGINX_HOST_IP}", - "RedirPort": 8080, + "cert": "${MESH_HOST}", + "tlsOffload": "${NGINX_HOST_IP}", + "redirPort": 8080, "WANonly": true, - "Minify": 1, - "Port": 4443, - "AgentAliasPort": 443, + "minify": 1, + "port": 4443, + "agentAliasPort": 443, "aliasPort": 443, - "AllowLoginToken": true, - "AllowFraming": true, - "_AgentPing": 60, - "AgentPong": 300, - "AllowHighQualityDesktop": true, + "allowLoginToken": true, + "allowFraming": true, + "_agentPing": 60, + "agentPong": 300, + "allowHighQualityDesktop": true, "agentCoreDump": false, - "Compression": true, - "WsCompression": true, - "AgentWsCompression": true, - "MaxInvalidLogin": { + "compression": true, + "wsCompression": true, + "agentWsCompression": true, + "maxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 @@ -52,12 +52,12 @@ if [ ! -f "/home/node/app/meshcentral-data/config.json" ] || [[ "${MESH_PERSISTE }, "domains": { "": { - "Title": "Tactical RMM", - "Title2": "TacticalRMM", - "NewAccounts": false, + "title": "Tactical RMM", + "title2": "TacticalRMM", + "newAccounts": false, "mstsc": true, - "GeoLocation": true, - "CertUrl": "https://${NGINX_HOST_IP}:${NGINX_HOST_PORT}", + "geoLocation": true, + "certUrl": "https://${NGINX_HOST_IP}:${NGINX_HOST_PORT}", "agentConfig": [ "webSocketMaskOverride=${WS_MASK_OVERRIDE}" ] } },