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

[fix] Run elasticsearch state earlier in setup

Browse Source
This commit is contained in:
William Wernert
2020-04-28 16:19:26 -04:00
parent 05c55efe12
commit 8afacd9709
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
setup/so-setup
View File

@@ -342,74 +342,74 @@ export percentage=0
set_progress_str 61 "$(print_salt_state_apply 'common')"
salt-call state.apply -l info common >> $setup_log 2>&1
if [[ $is_master || $is_node ]]; then
set_progress_str 62 "$(print_salt_state_apply 'elasticsearch')"
salt-call state.apply -l info elasticsearch >> $setup_log 2>&1
fi
if [[ $is_sensor ]]; then
set_progress_str 62 "$(print_salt_state_apply 'pcap')"
set_progress_str 63 "$(print_salt_state_apply 'pcap')"
salt-call state.apply -l info pcap >> $setup_log 2>&1
set_progress_str 63 "$(print_salt_state_apply 'suricata')"
set_progress_str 64 "$(print_salt_state_apply 'suricata')"
salt-call state.apply -l info suricata >> $setup_log 2>&1
set_progress_str 64 "$(print_salt_state_apply 'zeek')"
set_progress_str 65 "$(print_salt_state_apply 'zeek')"
salt-call state.apply -l info zeek >> $setup_log 2>&1
fi
if [[ $is_node ]]; then
set_progress_str 65 "$(print_salt_state_apply 'curator')"
set_progress_str 66 "$(print_salt_state_apply 'curator')"
salt-call state.apply -l info curator >> $setup_log 2>&1
fi
if [[ "$OSQUERY" = 1 ]]; then
set_progress_str 66 "$(print_salt_state_apply 'fleet')"
set_progress_str 67 "$(print_salt_state_apply 'fleet')"
salt-call state.apply -l info fleet >> $setup_log 2>&1
set_progress_str 67 "$(print_salt_state_apply 'redis')"
set_progress_str 68 "$(print_salt_state_apply 'redis')"
salt-call state.apply -l info redis >> $setup_log 2>&1
fi
if [[ "$WAZUH" = 1 ]]; then
set_progress_str 68 "$(print_salt_state_apply 'wazuh')"
set_progress_str 69 "$(print_salt_state_apply 'wazuh')"
salt-call state.apply -l info wazuh >> $setup_log 2>&1
fi
if [[ "$THEHIVE" = 1 ]]; then
set_progress_str 69 "$(print_salt_state_apply 'hive')"
set_progress_str 6970 "$(print_salt_state_apply 'hive')"
salt-call state.apply -l info hive >> $setup_log 2>&1
fi
if [[ "$STRELKA" = 1 ]]; then
set_progress_str 70 "$(print_salt_state_apply 'strelka')"
set_progress_str 71 "$(print_salt_state_apply 'strelka')"
salt-call state.apply -l info strelka >> $setup_log 2>&1
fi
if [[ "$PLAYBOOK" = 1 ]]; then
set_progress_str 71 "$(print_salt_state_apply 'playbook')"
set_progress_str 72 "$(print_salt_state_apply 'playbook')"
salt-call state.apply -l info playbook >> $setup_log 2>&1
fi
if [[ $is_master || $is_helix ]]; then
set_progress_str 72 "$(print_salt_state_apply 'master')"
set_progress_str 73 "$(print_salt_state_apply 'master')"
salt-call state.apply -l info master >> $setup_log 2>&1
set_progress_str 73 "$(print_salt_state_apply 'idstools')"
set_progress_str 74 "$(print_salt_state_apply 'idstools')"
salt-call state.apply -l info idstools >> $setup_log 2>&1
set_progress_str 74 "$(print_salt_state_apply 'utility')"
set_progress_str 75 "$(print_salt_state_apply 'utility')"
salt-call state.apply -l info utility >> $setup_log 2>&1
fi
if [[ ( $is_helix || $is_master || $is_node ) && ! $is_eval ]]; then
set_progress_str 75 "$(print_salt_state_apply 'logstash')"
set_progress_str 76 "$(print_salt_state_apply 'logstash')"
salt-call state.apply -l info logstash >> $setup_log 2>&1
set_progress_str 76 "$(print_salt_state_apply 'filebeat')"
set_progress_str 77 "$(print_salt_state_apply 'filebeat')"
salt-call state.apply -l info filebeat >> $setup_log 2>&1
fi
if [[ $is_master || $is_node ]]; then
set_progress_str 77 "$(print_salt_state_apply 'elasticsearch')"
salt-call state.apply -l info elasticsearch >> $setup_log 2>&1
fi
if [[ $is_master ]]; then
set_progress_str 78 "$(print_salt_state_apply 'soc')"
salt-call state.apply -l info soc >> "$setup_log" 2>&1