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

Merge pull request #12171 from Security-Onion-Solutions/2.4/dev

Browse Source 
Merge 2.4 dev
This commit is contained in:
weslambert
2024-01-12 08:50:15 -05:00
committed by GitHub
parent 5eae349938 af3aa53612
commit 05679e79fc
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -563,7 +563,9 @@ up_to_2.4.30() {
} }
up_to_2.4.40() { 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 INSTALLEDVERSION=2.4.40
} }
@@ -985,16 +987,6 @@ main() {
salt-call state.apply salt.minion -l info queue=True salt-call state.apply salt.minion -l info queue=True
echo "" 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 enable_highstate
echo "" echo ""