Skip to content

Commit

Permalink
Release 0.2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Dec 11, 2020
2 parents fb34c09 + f88e7f8 commit e413c02
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
19 changes: 12 additions & 7 deletions api/tacticalrmm/core/goinstaller/installer.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func main() {
debugLog := flag.String("log", "", "Verbose output")
localMesh := flag.String("local-mesh", "", "Use local mesh agent")
noSalt := flag.Bool("nosalt", false, "Does not install salt")
silent := flag.Bool("silent", false, "Do not popup any message boxes during installation")
cert := flag.String("cert", "", "Path to ca.pem")
timeout := flag.String("timeout", "", "Timeout for subprocess calls")
flag.Parse()
Expand All @@ -78,35 +79,39 @@ func main() {
}

if debug {
cmdArgs = append(cmdArgs, "--log", "DEBUG")
cmdArgs = append(cmdArgs, "-log", "debug")
}

if *silent {
cmdArgs = append(cmdArgs, "-silent")
}

if *noSalt {
cmdArgs = append(cmdArgs, "-nosalt")
}

if len(strings.TrimSpace(*localMesh)) != 0 {
cmdArgs = append(cmdArgs, "--local-mesh", *localMesh)
cmdArgs = append(cmdArgs, "-local-mesh", *localMesh)
}

if len(strings.TrimSpace(*cert)) != 0 {
cmdArgs = append(cmdArgs, "--cert", *cert)
cmdArgs = append(cmdArgs, "-cert", *cert)
}

if len(strings.TrimSpace(*timeout)) != 0 {
cmdArgs = append(cmdArgs, "--timeout", *timeout)
cmdArgs = append(cmdArgs, "-timeout", *timeout)
}

if Rdp == "1" {
cmdArgs = append(cmdArgs, "--rdp")
cmdArgs = append(cmdArgs, "-rdp")
}

if Ping == "1" {
cmdArgs = append(cmdArgs, "--ping")
cmdArgs = append(cmdArgs, "-ping")
}

if Power == "1" {
cmdArgs = append(cmdArgs, "--power")
cmdArgs = append(cmdArgs, "-power")
}

if debug {
Expand Down
6 changes: 3 additions & 3 deletions api/tacticalrmm/tacticalrmm/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
AUTH_USER_MODEL = "accounts.User"

# latest release
TRMM_VERSION = "0.2.11"
TRMM_VERSION = "0.2.12"

# bump this version everytime vue code is changed
# to alert user they need to manually refresh their browser
APP_VER = "0.0.98"
APP_VER = "0.0.99"

# https://github.com/wh1te909/salt
LATEST_SALT_VER = "1.1.0"

# https://github.com/wh1te909/rmmagent
LATEST_AGENT_VER = "1.1.6"
LATEST_AGENT_VER = "1.1.7"

MESH_VER = "0.7.14"

Expand Down
14 changes: 10 additions & 4 deletions web/src/components/modals/agents/AgentDownload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,25 @@
>
<div class="q-pa-xs q-gutter-xs">
<q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
<code>--log DEBUG</code>
<code>-log debug</code>
</q-badge>
<span>To enable verbose output during the install</span>
</div>
<div class="q-pa-xs q-gutter-xs">
<q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
<code>--nosalt</code>
<code>-silent</code>
</q-badge>
<span>Do not popup any message boxes during install</span>
</div>
<div class="q-pa-xs q-gutter-xs">
<q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
<code>-nosalt</code>
</q-badge>
<span> Do not install salt during agent install. </span>
</div>
<div class="q-pa-xs q-gutter-xs">
<q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
<code>--local-mesh "C:\\&lt;some folder or path&gt;\\meshagent.exe"</code>
<code>-local-mesh "C:\\&lt;some folder or path&gt;\\meshagent.exe"</code>
</q-badge>
<span>
To skip downloading the Mesh Agent during the install. Download it
Expand All @@ -49,7 +55,7 @@
</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>
<code>-cert "C:\\&lt;some folder or path&gt;\\ca.pem"</code>
</q-badge>
<span> To use a domain CA </span>
</div>
Expand Down

0 comments on commit e413c02

Please sign in to comment.