add optional installer arg for custom mesh dir #487

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")
 

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
+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.

web/src/components/modals/agents/AgentDownload.vue

@@ -47,6 +47,18 @@
             >
           </span>
         </div>
+        <div class="q-pa-xs q-gutter-xs">
+          <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
+            <code>-meshdir "C:\Program Files\Your Company Name\Mesh Agent"</code>
+          </q-badge>
+          <span>Specify full path to the directory containing MeshAgent.exe if using custom agent branding</span>
+        </div>
+        <div class="q-pa-xs q-gutter-xs">
+          <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
+            <code>-nomesh</code>
+          </q-badge>
+          <span>Don't install the mesh agent</span>
+        </div>
         <div class="q-pa-xs q-gutter-xs">
           <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
             <code>-cert "C:\\&lt;some folder or path&gt;\\ca.pem"</code>