Introduces switch for grr fleetspeak client dev option

daschwanden · Jul 22, 2024 · 7ceeb90 · 7ceeb90
1 parent 1b0525d
commit 7ceeb90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/docker_config_files/client/grr_fleetspeak_client.sh b/docker_config_files/client/grr_fleetspeak_client.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ -f /usr/share/grr-server/bin/grr_fleetspeak_client ]; then
+  /usr/share/grr-server/bin/python /usr/share/grr-server/bin/grr_fleetspeak_client
+else
+  /usr/sbin/grrd
+fi
diff --git a/docker_config_files/client/textservices/grr_client.service b/docker_config_files/client/textservices/grr_client.service
@@ -2,8 +2,7 @@ name: "GRR"
 factory: "Daemon"
 config: {
   [type.googleapis.com/fleetspeak.daemonservice.Config]: {
-    argv: "/usr/share/grr-server/bin/python"
-    argv: "/usr/share//grr-server/bin/grr_fleetspeak_client"
+    argv: "/configs/client/grr_fleetspeak_client.sh"
     argv: "--config"
     argv: "/configs/client/grr.client.yaml"
   }