From bed6cd287417245e7f0b96ea8b888118a5aada3c Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Wed, 30 Sep 2020 06:45:11 +0000 Subject: [PATCH] update installer for new optional agent flags --- api/tacticalrmm/core/installer.go | 10 ++++++++++ api/tacticalrmm/tacticalrmm/settings.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/api/tacticalrmm/core/installer.go b/api/tacticalrmm/core/installer.go index 4a4552e1..da91b05d 100644 --- a/api/tacticalrmm/core/installer.go +++ b/api/tacticalrmm/core/installer.go @@ -57,6 +57,8 @@ func main() { debugLog := flag.String("log", "", "Verbose output") localSalt := flag.String("local-salt", "", "Use local salt minion") localMesh := flag.String("local-mesh", "", "Use local mesh agent") + cert := flag.String("cert", "", "Path to ca.pem") + timeout := flag.String("timeout", "", "Timeout for subprocess calls") flag.Parse() var debug bool = false @@ -87,6 +89,14 @@ func main() { cmdArgs = append(cmdArgs, "--local-mesh", *localMesh) } + if len(strings.TrimSpace(*cert)) != 0 { + cmdArgs = append(cmdArgs, "--cert", *cert) + } + + if len(strings.TrimSpace(*timeout)) != 0 { + cmdArgs = append(cmdArgs, "--timeout", *timeout) + } + if Rdp == "1" { cmdArgs = append(cmdArgs, "--rdp") } diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 3a2dc23c..a40c09a0 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -16,7 +16,7 @@ APP_VER = "0.0.64" # https://github.com/wh1te909/salt LATEST_SALT_VER = "1.1.0" -LATEST_AGENT_VER = "0.11.1" +LATEST_AGENT_VER = "0.11.2" DL_64 = f"https://github.com/wh1te909/winagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe" DL_32 = f"https://github.com/wh1te909/winagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}-x86.exe"