CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

pass in UPDATE_DIR as a pillar

Browse Source
This commit is contained in:
m0duspwnens
2024-02-14 13:28:12 -05:00
parent 2e9fa2438b
commit 79e98e508f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
salt/common/soup_scripts.sls
View File

@@ -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:

2
salt/manager/tools/sbin/soup
View File

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