Merge pull request #13020 from Security-Onion-Solutions/issue/13012

Issue/13012
Security-Onion-Solutions · May 15, 2024 · 08024c7 · 08024c7
2 parents 795de7a + 3a56058
commit 08024c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
@@ -438,9 +438,9 @@ post_to_2.4.60() {
 }
 
 post_to_2.4.70() {
-  echo "Removing idh.services from IDH node pillar files"
-  for file in /opt/so/saltstack/local/pillar/minions/*_idh.sls; do
-    if [[ ! $file =~ "/opt/so/saltstack/local/pillar/minions/adv_" ]]; then
+  echo "Removing idh.services from any existing IDH node pillar files"
+  for file in /opt/so/saltstack/local/pillar/minions/*.sls; do
+    if [[ $file =~ "_idh.sls" && ! $file =~ "/opt/so/saltstack/local/pillar/minions/adv_" ]]; then
       echo "Removing idh.services from: $file"
       so-yaml.py remove "$file" idh.services
     fi