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 ""