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

Move idstools and master earlier in the setup

Browse Source
This commit is contained in:
Mike Reeves
2020-05-12 17:47:55 -04:00
committed by GitHub
parent bc4b4385bf
commit 71f99528ae
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
setup/so-setup
View File

@@ -356,6 +356,13 @@ export percentage=0
set_progress_str 26 'Downloading containers from the internet' set_progress_str 26 'Downloading containers from the internet'
salt-call state.apply -l info registry >> "$setup_log" 2>&1 salt-call state.apply -l info registry >> "$setup_log" 2>&1
docker_seed_registry 2>> "$setup_log" # ~ 60% when finished docker_seed_registry 2>> "$setup_log" # ~ 60% when finished
set_progress_str 27 "$(print_salt_state_apply 'master')"
salt-call state.apply -l info master >> $setup_log 2>&1
set_progress_str 28 "$(print_salt_state_apply 'idstools')"
salt-call state.apply -l info idstools >> $setup_log 2>&1
fi fi
set_progress_str 62 "$(print_salt_state_apply 'firewall')" set_progress_str 62 "$(print_salt_state_apply 'firewall')"
@@ -432,13 +439,7 @@ export percentage=0
salt-call state.apply -l info navigator >> $setup_log 2>&1 salt-call state.apply -l info navigator >> $setup_log 2>&1
fi fi
if [[ $is_master || $is_helix ]]; then if [[ $is_master || $is_helix ]]; then
set_progress_str 79 "$(print_salt_state_apply 'master')"
salt-call state.apply -l info master >> $setup_log 2>&1
set_progress_str 80 "$(print_salt_state_apply 'idstools')"
salt-call state.apply -l info idstools >> $setup_log 2>&1
set_progress_str 81 "$(print_salt_state_apply 'utility')" set_progress_str 81 "$(print_salt_state_apply 'utility')"
salt-call state.apply -l info utility >> $setup_log 2>&1 salt-call state.apply -l info utility >> $setup_log 2>&1
fi fi
@@ -477,4 +478,4 @@ if [[ "$success" = 0 ]]; then
else else
whiptail_setup_failed whiptail_setup_failed
shutdown -r now shutdown -r now
fi fi