merge with 2.4.120, fix merge conflicts

This commit is contained in:
m0duspwnens
2024-10-25 15:09:38 -04:00
520 changed files with 12109 additions and 250 deletions

View File

@@ -703,8 +703,10 @@ if ! [[ -f $install_opt_file ]]; then
logCmd "so-minion -o=setup"
title "Creating Global SLS"
# Airgap Rules
airgap_rules
if [[ $is_airgap ]]; then
# Airgap Rules
airgap_rules
fi
manager_pillar
@@ -770,10 +772,14 @@ if ! [[ -f $install_opt_file ]]; then
title "Downloading IDS Rules"
logCmd "so-rule-update"
if [[ $monints || $is_import ]]; then
title "Restarting Suricata to pick up the new rules"
logCmd "so-suricata-restart"
title "Applying the Suricata state to load the new rules"
logCmd "salt-call state.apply suricata -l info"
fi
fi
if [[ $is_airgap ]]; then
title "Syncing AI-Generated Detection Summaries"
airgap_detection_summaries
fi
title "Setting up Kibana Default Space"
logCmd "so-kibana-space-defaults"
add_web_user