From e6e090132920bd020f5bf24b86dee22405377cf9 Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Wed, 12 May 2021 03:32:03 +0000
Subject: [PATCH] add optional installer arg for custom mesh dir #487

---
 api/tacticalrmm/agents/views.py                    |  2 +-
 docs/docs/install_agent.md                         | 12 +++++++++++-
 web/src/components/modals/agents/AgentDownload.vue | 12 ++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

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 @@
             >
           </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>