diff --git a/api/tacticalrmm/agents/views.py b/api/tacticalrmm/agents/views.py index bfa1ca37..1b268c78 100644 --- a/api/tacticalrmm/agents/views.py +++ b/api/tacticalrmm/agents/views.py @@ -599,7 +599,7 @@ def run_script(request): def recover_mesh(request, pk): agent = get_object_or_404(Agent, pk=pk) data = {"func": "recover", "payload": {"mode": "mesh"}} - r = asyncio.run(agent.nats_cmd(data, timeout=45)) + r = asyncio.run(agent.nats_cmd(data, timeout=90)) if r != "ok": return notify_error("Unable to contact the agent") diff --git a/docs/docs/install_agent.md b/docs/docs/install_agent.md index 0f0420d2..a2878ca6 100644 --- a/docs/docs/install_agent.md +++ b/docs/docs/install_agent.md @@ -69,4 +69,14 @@ This will not popup any message boxes during install, either any error messages ``` -proxy "http://proxyserver:port" ``` -Use a http proxy \ No newline at end of file +Use a http proxy + +``` +-meshdir "C:\Program Files\Your Company Name\Mesh Agent" +``` +Specify the full path to the directory containing `MeshAgent.exe` if using custom agent branding for your MeshCentral instance. + +``` +-nomesh +``` +Do not install meshcentral agent during tactical agent install. Note: take control, remote terminal and file browser will not work. \ No newline at end of file diff --git a/web/src/components/modals/agents/AgentDownload.vue b/web/src/components/modals/agents/AgentDownload.vue index 98409665..661217d6 100644 --- a/web/src/components/modals/agents/AgentDownload.vue +++ b/web/src/components/modals/agents/AgentDownload.vue @@ -47,6 +47,18 @@ > +
-meshdir "C:\Program Files\Your Company Name\Mesh Agent"
+ -nomesh
+ -cert "C:\\<some folder or path>\\ca.pem"