From a2467d0418532cef20e9c13724b13ee1e4e8618f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 5 Jun 2024 08:24:57 -0400
Subject: [PATCH 1/3] move so-tcpreplay to sensor state

---
 salt/sensor/init.sls                          | 19 ++++++++++++++++++-
 .../tools/sbin_jinja/so-tcpreplay             |  0
 2 files changed, 18 insertions(+), 1 deletion(-)
 rename salt/{common => sensor}/tools/sbin_jinja/so-tcpreplay (100%)

diff --git a/salt/sensor/init.sls b/salt/sensor/init.sls
index 53cd808c6..ca1cf13c2 100644
--- a/salt/sensor/init.sls
+++ b/salt/sensor/init.sls
@@ -9,4 +9,21 @@ execute_checksum:
   cmd.run:
     - name: /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable
     - onchanges:
-      - file: offload_script
\ No newline at end of file
+      - file: offload_script
+
+sensor_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://sensor/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+sensor_sbin_jinja:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://sensor/tools/sbin_jinja
+    - user: 939
+    - group: 939 
+    - file_mode: 755
+    - template: jinja
diff --git a/salt/common/tools/sbin_jinja/so-tcpreplay b/salt/sensor/tools/sbin_jinja/so-tcpreplay
similarity index 100%
rename from salt/common/tools/sbin_jinja/so-tcpreplay
rename to salt/sensor/tools/sbin_jinja/so-tcpreplay

From ff5773c8379d140cb6a239e89f4dd48672b15f7e Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 5 Jun 2024 08:56:32 -0400
Subject: [PATCH 2/3] move so-tcpreplay back to common. return empty string if
 no sensor.interface pillar

---
 .../tools/sbin_jinja/so-tcpreplay              |  2 +-
 salt/sensor/init.sls                           | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 rename salt/{sensor => common}/tools/sbin_jinja/so-tcpreplay (96%)

diff --git a/salt/sensor/tools/sbin_jinja/so-tcpreplay b/salt/common/tools/sbin_jinja/so-tcpreplay
similarity index 96%
rename from salt/sensor/tools/sbin_jinja/so-tcpreplay
rename to salt/common/tools/sbin_jinja/so-tcpreplay
index a9551c0fa..969ca699f 100755
--- a/salt/sensor/tools/sbin_jinja/so-tcpreplay
+++ b/salt/common/tools/sbin_jinja/so-tcpreplay
@@ -10,7 +10,7 @@
 . /usr/sbin/so-common
 . /usr/sbin/so-image-common
 
-REPLAYIFACE=${REPLAYIFACE:-"{{pillar.sensor.interface}}"}
+REPLAYIFACE=${REPLAYIFACE:-"{{salt['pillar.get']('sensor:interface', '')}}"}
 REPLAYSPEED=${REPLAYSPEED:-10}
 
 mkdir -p /opt/so/samples
diff --git a/salt/sensor/init.sls b/salt/sensor/init.sls
index ca1cf13c2..c9c6a6db5 100644
--- a/salt/sensor/init.sls
+++ b/salt/sensor/init.sls
@@ -10,20 +10,4 @@ execute_checksum:
     - name: /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable
     - onchanges:
       - file: offload_script
-
-sensor_sbin:
-  file.recurse:
-    - name: /usr/sbin
-    - source: salt://sensor/tools/sbin
-    - user: 939
-    - group: 939
-    - file_mode: 755
-
-sensor_sbin_jinja:
-  file.recurse:
-    - name: /usr/sbin
-    - source: salt://sensor/tools/sbin_jinja
-    - user: 939
-    - group: 939 
-    - file_mode: 755
-    - template: jinja
+      
\ No newline at end of file

From f6a8a21f94715786f6b645b6342de76a836d498a Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 5 Jun 2024 08:58:46 -0400
Subject: [PATCH 3/3] remove space

---
 salt/sensor/init.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/sensor/init.sls b/salt/sensor/init.sls
index c9c6a6db5..730a7c7ad 100644
--- a/salt/sensor/init.sls
+++ b/salt/sensor/init.sls
@@ -10,4 +10,3 @@ execute_checksum:
     - name: /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable
     - onchanges:
       - file: offload_script
-      
\ No newline at end of file