mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into issue/1403
This commit is contained in:
@@ -518,14 +518,9 @@ fi
|
|||||||
|
|
||||||
set_progress_str 12 'Generating manager pillar'
|
set_progress_str 12 'Generating manager pillar'
|
||||||
manager_pillar >> $setup_log 2>&1
|
manager_pillar >> $setup_log 2>&1
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $is_sensor || $is_import ]]; then
|
|
||||||
set_progress_str 13 'Generating zeeklogs pillar'
|
|
||||||
zeek_logs_enabled >> $setup_log 2>&1
|
zeek_logs_enabled >> $setup_log 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
set_progress_str 16 'Running first Salt checkin'
|
set_progress_str 16 'Running first Salt checkin'
|
||||||
salt_firstcheckin >> $setup_log 2>&1
|
salt_firstcheckin >> $setup_log 2>&1
|
||||||
|
|
||||||
@@ -622,7 +617,6 @@ fi
|
|||||||
salt-call state.apply -l info suricata >> $setup_log 2>&1
|
salt-call state.apply -l info suricata >> $setup_log 2>&1
|
||||||
|
|
||||||
set_progress_str 67 "$(print_salt_state_apply 'zeek')"
|
set_progress_str 67 "$(print_salt_state_apply 'zeek')"
|
||||||
zeek_logs_enabled >> $setup_log 2>&1
|
|
||||||
salt-call state.apply -l info zeek >> $setup_log 2>&1
|
salt-call state.apply -l info zeek >> $setup_log 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user