From b89b7cab59b12f623e5d05ebe0b145a488aa1780 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 12 Jan 2024 08:37:32 -0500
Subject: [PATCH 1/3] Remove old nav layers

---
 salt/manager/tools/sbin/soup | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 47712d81d..ad8c0dc79 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -466,7 +466,10 @@ post_to_2.4.30() {
 }
 
 post_to_2.4.40() {
-  echo "Nothing to apply"
+  echo "Removing old ATT&CK Navigator Layers..."
+  rm -rf /opt/so/conf/navigator/layers/enterprise-attack.json
+  rm -rf /opt/so/conf/navigator/layers/nav_layer_playbook.json
+
   POSTVERSION=2.4.40
 }
 

From 61b2a76a092a72b6cde0d6257344be7f36f4a0ab Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 12 Jan 2024 08:46:23 -0500
Subject: [PATCH 2/3] Remove old nav layers-rev2

---
 salt/manager/tools/sbin/soup | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index ad8c0dc79..e1747d579 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -466,9 +466,7 @@ post_to_2.4.30() {
 }
 
 post_to_2.4.40() {
-  echo "Removing old ATT&CK Navigator Layers..."
-  rm -rf /opt/so/conf/navigator/layers/enterprise-attack.json
-  rm -rf /opt/so/conf/navigator/layers/nav_layer_playbook.json
+  echo "Nothing to apply"
 
   POSTVERSION=2.4.40
 }
@@ -566,7 +564,9 @@ up_to_2.4.30() {
 }
 
 up_to_2.4.40() {
-  echo "Nothing to do for 2.4.40"
+  echo "Removing old ATT&CK Navigator Layers..."
+  rm -f /opt/so/conf/navigator/layers/enterprise-attack.json
+  rm -f /opt/so/conf/navigator/layers/nav_layer_playbook.json
 
   INSTALLEDVERSION=2.4.40
 }
@@ -988,16 +988,6 @@ main() {
     salt-call state.apply salt.minion -l info queue=True
     echo ""
 
-    # Only regenerate osquery packages if Fleet is enabled
-    FLEET_MANAGER=$(lookup_pillar fleet_manager)
-    FLEET_NODE=$(lookup_pillar fleet_node)
-    if [[ "$FLEET_MANAGER" == "True" || "$FLEET_NODE" == "True" ]]; then
-      echo ""
-      echo "Regenerating Osquery Packages.... This will take several minutes."
-      salt-call state.apply fleet.event_gen-packages -l info queue=True
-      echo ""
-    fi
-
     enable_highstate
 
     echo ""

From 2f8ce33cf70afc505b486ecd9e32a6538b0f8edc Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Fri, 12 Jan 2024 08:47:09 -0500
Subject: [PATCH 3/3] formatting

---
 salt/manager/tools/sbin/soup | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index e1747d579..f9ce6d041 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -467,7 +467,6 @@ post_to_2.4.30() {
 
 post_to_2.4.40() {
   echo "Nothing to apply"
-
   POSTVERSION=2.4.40
 }