Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for newer mesh

This commit is contained in:
wh1te909 2022-09-11 01:33:00 +00:00
parent a5345e8468
commit 2ccacbe5f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/tacticalrmm/agents/utils.py
View File

@ -51,7 +51,7 @@ def generate_linux_install(
uri = get_mesh_ws_url() uri = get_mesh_ws_url()
mesh_id = asyncio.run(get_mesh_device_id(uri, core.mesh_device_group)) mesh_id = asyncio.run(get_mesh_device_id(uri, core.mesh_device_group))
mesh_dl = ( mesh_dl = (
f"{core.mesh_site}/meshagents?id={mesh_id}&installflags=0&meshinstall={arch_id}" f"{core.mesh_site}/meshagents?id={mesh_id}&installflags=2&meshinstall={arch_id}"
) )
sh = settings.LINUX_AGENT_SCRIPT sh = settings.LINUX_AGENT_SCRIPT

6
api/tacticalrmm/core/agent_linux.sh
View File

@ -85,14 +85,14 @@ InstallMesh() {
wget --no-check-certificate -q -O ${meshTmpBin} ${meshDL} wget --no-check-certificate -q -O ${meshTmpBin} ${meshDL}
chmod +x ${meshTmpBin} chmod +x ${meshTmpBin}
mkdir -p ${meshDir} mkdir -p ${meshDir}
env LC_ALL=en_US.UTF-8 LANGUAGE=en_US ${meshTmpBin} -install --installPath=${meshDir} env LC_ALL=en_US.UTF-8 LANGUAGE=en_US XAUTHORITY=foo DISPLAY=bar ${meshTmpBin} -install --installPath=${meshDir}
sleep 1 sleep 1
rm -rf ${meshTmpDir} rm -rf ${meshTmpDir}
} }
RemoveMesh() { RemoveMesh() {
if [ -f "${meshSystemBin}" ]; then if [ -f "${meshSystemBin}" ]; then
${meshSystemBin} -uninstall env XAUTHORITY=foo DISPLAY=bar ${meshSystemBin} -uninstall
sleep 1 sleep 1
fi fi
@ -133,7 +133,7 @@ else
InstallMesh InstallMesh
sleep 2 sleep 2
echo "Getting mesh node id..." echo "Getting mesh node id..."
MESH_NODE_ID=$(${agentBin} -m nixmeshnodeid) MESH_NODE_ID=$(env XAUTHORITY=foo DISPLAY=bar ${agentBin} -m nixmeshnodeid)
fi fi
if [ ! -d "${agentBinPath}" ]; then if [ ! -d "${agentBinPath}" ]; then