From 79e98e508f0d6f0ebd100e4d38bf767151cc82a2 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 14 Feb 2024 13:28:12 -0500
Subject: [PATCH 1/3] pass in UPDATE_DIR as a pillar

---
 salt/common/soup_scripts.sls | 7 ++-----
 salt/manager/tools/sbin/soup | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls
index c02f11172..9c3b8ad3a 100644
--- a/salt/common/soup_scripts.sls
+++ b/salt/common/soup_scripts.sls
@@ -6,11 +6,8 @@ remove_common_so-firewall:
   file.absent:
     - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall
 
-{% if salt['pillar.get']('global:airgap') %}
-{%   set UPDATE_DIR='/tmp/soagupdate/SecurityOnion'%}
-{% else %}
-{%   set UPDATE_DIR='/tmp/sogh/securityonion'%}
-{% endif %}
+{# this pillar isn't defined anywhere. it is passed in from soup when the state is called #}
+{% set UPDATE_DIR= salt['pillar.get']('UPDATE_DIR') %}
 
 copy_so-common_common_tools_sbin:
   file.copy:
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index 8b9d4a6b3..c44883d15 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -803,7 +803,7 @@ verify_latest_update_script() {
       echo "Succesfully updated soup scripts."
     else
       echo "There was a problem updating soup scripts. Trying to rerun script update."
-      salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local
+      salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local pillar="{'UPDATE_DIR': $UPDATE_DIR}"
     fi
 
     echo ""

From c1f467a06819c22e3bec737c7270b11c31bc6d9f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 14 Feb 2024 14:22:18 -0500
Subject: [PATCH 2/3] handle airgap

---
 salt/common/soup_scripts.sls | 8 ++++++--
 salt/manager/tools/sbin/soup | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls
index 9c3b8ad3a..5a7bdef47 100644
--- a/salt/common/soup_scripts.sls
+++ b/salt/common/soup_scripts.sls
@@ -6,8 +6,12 @@ remove_common_so-firewall:
   file.absent:
     - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall
 
-{# this pillar isn't defined anywhere. it is passed in from soup when the state is called #}
-{% set UPDATE_DIR= salt['pillar.get']('UPDATE_DIR') %}
+{% import_yaml '/opt/so/saltstack/local/pillar/global/soc_global.sls' as SOC_GLOBAL %}
+{% if SOC_GLOBAL.global.airgap %}
+{%   set UPDATE_DIR='/tmp/soagupdate/SecurityOnion' %}
+{% else %}
+{%   set UPDATE_DIR='/tmp/sogh/securityonion' %}
+{% endif %}
 
 copy_so-common_common_tools_sbin:
   file.copy:
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index c44883d15..8b9d4a6b3 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -803,7 +803,7 @@ verify_latest_update_script() {
       echo "Succesfully updated soup scripts."
     else
       echo "There was a problem updating soup scripts. Trying to rerun script update."
-      salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local pillar="{'UPDATE_DIR': $UPDATE_DIR}"
+      salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local
     fi
 
     echo ""

From a2b17d23485804bd4e4895f3e3e5f70d9a83d8e6 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 14 Feb 2024 14:27:41 -0500
Subject: [PATCH 3/3] move jinja to top

---
 salt/common/soup_scripts.sls | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls
index 5a7bdef47..fd32b8a28 100644
--- a/salt/common/soup_scripts.sls
+++ b/salt/common/soup_scripts.sls
@@ -1,3 +1,10 @@
+{% import_yaml '/opt/so/saltstack/local/pillar/global/soc_global.sls' as SOC_GLOBAL %}
+{% if SOC_GLOBAL.global.airgap %}
+{%   set UPDATE_DIR='/tmp/soagupdate/SecurityOnion' %}
+{% else %}
+{%   set UPDATE_DIR='/tmp/sogh/securityonion' %}
+{% endif %}
+
 remove_common_soup:
   file.absent:
     - name: /opt/so/saltstack/default/salt/common/tools/sbin/soup
@@ -6,13 +13,6 @@ remove_common_so-firewall:
   file.absent:
     - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall
 
-{% import_yaml '/opt/so/saltstack/local/pillar/global/soc_global.sls' as SOC_GLOBAL %}
-{% if SOC_GLOBAL.global.airgap %}
-{%   set UPDATE_DIR='/tmp/soagupdate/SecurityOnion' %}
-{% else %}
-{%   set UPDATE_DIR='/tmp/sogh/securityonion' %}
-{% endif %}
-
 copy_so-common_common_tools_sbin:
   file.copy:
     - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-common