Merge pull request #1213 from stavros-k/json

Updating meshcentral's config casing to match upstreams json schema.
This commit is contained in:
Dan 2022-10-06 09:38:16 -07:00 committed by GitHub
commit 93a5dd5de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 43 deletions

View File

@ -27,24 +27,24 @@ if [ ! -f "/home/node/app/meshcentral-data/config.json" ] || [[ "${MESH_PERSISTE
{ {
"settings": { "settings": {
"mongodb": "${encoded_uri}", "mongodb": "${encoded_uri}",
"Cert": "${MESH_HOST}", "cert": "${MESH_HOST}",
"TLSOffload": "${NGINX_HOST_IP}", "tlsOffload": "${NGINX_HOST_IP}",
"RedirPort": 8080, "redirPort": 8080,
"WANonly": true, "WANonly": true,
"Minify": 1, "minify": 1,
"Port": 4443, "port": 4443,
"AgentAliasPort": 443, "agentAliasPort": 443,
"aliasPort": 443, "aliasPort": 443,
"AllowLoginToken": true, "allowLoginToken": true,
"AllowFraming": true, "allowFraming": true,
"_AgentPing": 60, "_agentPing": 60,
"AgentPong": 300, "agentPong": 300,
"AllowHighQualityDesktop": true, "allowHighQualityDesktop": true,
"agentCoreDump": false, "agentCoreDump": false,
"Compression": true, "compression": true,
"WsCompression": true, "wsCompression": true,
"AgentWsCompression": true, "agentWsCompression": true,
"MaxInvalidLogin": { "maxInvalidLogin": {
"time": 5, "time": 5,
"count": 5, "count": 5,
"coolofftime": 30 "coolofftime": 30
@ -52,12 +52,12 @@ if [ ! -f "/home/node/app/meshcentral-data/config.json" ] || [[ "${MESH_PERSISTE
}, },
"domains": { "domains": {
"": { "": {
"Title": "Tactical RMM", "title": "Tactical RMM",
"Title2": "TacticalRMM", "title2": "TacticalRMM",
"NewAccounts": false, "newAccounts": false,
"mstsc": true, "mstsc": true,
"GeoLocation": true, "geoLocation": true,
"CertUrl": "https://${NGINX_HOST_IP}:${NGINX_HOST_PORT}", "certUrl": "https://${NGINX_HOST_IP}:${NGINX_HOST_PORT}",
"agentConfig": [ "webSocketMaskOverride=${WS_MASK_OVERRIDE}" ] "agentConfig": [ "webSocketMaskOverride=${WS_MASK_OVERRIDE}" ]
} }
}, },

View File

@ -325,34 +325,34 @@ sudo chown ${USER}:${USER} -R /meshcentral
meshcfg="$(cat << EOF meshcfg="$(cat << EOF
{ {
"settings": { "settings": {
"Cert": "${meshdomain}", "cert": "${meshdomain}",
"MongoDb": "mongodb://127.0.0.1:27017", "mongoDb": "mongodb://127.0.0.1:27017",
"MongoDbName": "meshcentral", "mongoDbName": "meshcentral",
"WANonly": true, "WANonly": true,
"Minify": 1, "minify": 1,
"Port": 4430, "port": 4430,
"AliasPort": 443, "aliasPort": 443,
"RedirPort": 800, "redirPort": 800,
"AllowLoginToken": true, "allowLoginToken": true,
"AllowFraming": true, "allowFraming": true,
"_AgentPing": 60, "_agentPing": 60,
"AgentPong": 300, "agentPong": 300,
"AllowHighQualityDesktop": true, "allowHighQualityDesktop": true,
"TlsOffload": "127.0.0.1", "tlsOffload": "127.0.0.1",
"agentCoreDump": false, "agentCoreDump": false,
"Compression": true, "compression": true,
"WsCompression": true, "wsCompression": true,
"AgentWsCompression": true, "agentWsCompression": true,
"MaxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 } "maxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 }
}, },
"domains": { "domains": {
"": { "": {
"Title": "Tactical RMM", "title": "Tactical RMM",
"Title2": "Tactical RMM", "title2": "Tactical RMM",
"NewAccounts": false, "newAccounts": false,
"CertUrl": "https://${meshdomain}:443/", "certUrl": "https://${meshdomain}:443/",
"GeoLocation": true, "geoLocation": true,
"CookieIpCheck": false, "cookieIpCheck": false,
"mstsc": true "mstsc": true
} }
} }