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] so-setup fixes (function ordering

Browse Source 
* Firewall function needs to be run at different times for different install types
* Minion pillars need to be copied before running any salt states
This commit is contained in:
William Wernert
2020-05-04 16:56:23 -04:00
parent d9a8fa0474
commit 0b37437102
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
setup/so-setup
View File

@@ -305,8 +305,10 @@ export percentage=0
master_pillar 2>> "$setup_log" master_pillar 2>> "$setup_log"
fi fi
if [[ $is_minion ]]; then
set_progress_str 14 'Configuring firewall' set_progress_str 14 'Configuring firewall'
set_initial_firewall_policy 2>> "$setup_log" set_initial_firewall_policy 2>> "$setup_log"
fi
set_progress_str 16 'Running first Salt checkin' set_progress_str 16 'Running first Salt checkin'
salt_firstcheckin 2>> "$setup_log" salt_firstcheckin 2>> "$setup_log"
@@ -334,22 +336,26 @@ export percentage=0
salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1 salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1
fi fi
set_progress_str 22 'Generating CA and checking in' set_progress_str 22 'Copying minion pillars to master'
salt_checkin 2>> "$setup_log"
set_progress_str 23 "$(print_salt_state_apply 'schedule')"
salt-call state.apply -l info schedule >> $setup_log 2>&1
set_progress_str 24 'Copying minion pillars to master'
copy_minion_tmp_files 2>> "$setup_log" copy_minion_tmp_files 2>> "$setup_log"
set_progress_str 23 'Generating CA and checking in'
salt_checkin 2>> "$setup_log"
set_progress_str 24 "$(print_salt_state_apply 'schedule')"
salt-call state.apply -l info schedule >> $setup_log 2>&1
if [[ $is_master || $is_helix ]]; then if [[ $is_master || $is_helix ]]; then
set_progress_str 25 'Downloading containers from the internet' set_progress_str 25 'Configuring firewall'
set_initial_firewall_policy 2>> "$setup_log"
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
fi fi
set_progress_str 61 "$(print_salt_state_apply 'firewall')" set_progress_str 62 "$(print_salt_state_apply 'firewall')"
salt-call state.apply -l info firewall >> $setup_log 2>&1 salt-call state.apply -l info firewall >> $setup_log 2>&1
set_progress_str 63 "$(print_salt_state_apply 'common')" set_progress_str 63 "$(print_salt_state_apply 'common')"