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

[fix] Move salt-key accept to after the ca + ssl states

Browse Source
This commit is contained in:
William Wernert
2020-04-30 11:31:33 -04:00
parent 4c6b841b16
commit 6359da0010
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
setup/so-setup
View File

@@ -307,27 +307,27 @@ export percentage=0
set_progress_str 16 'Copying minion pillars to master' set_progress_str 16 'Copying minion pillars to master'
copy_minion_tmp_files 2>> "$setup_log" copy_minion_tmp_files 2>> "$setup_log"
if [[ $is_node ]]; then
set_progress_str 17 'Setting node type'
set_node_type 2>> "$setup_log"
set_progress_str 18 'Generating search node pillar'
node_pillar 2>> "$setup_log"
fi
set_progress_str 19 'Generating CA and checking in'
salt_checkin 2>> "$setup_log"
if [[ $is_minion ]]; then if [[ $is_minion ]]; then
set_progress_str 17 'Accepting Salt key on master' set_progress_str 20 'Accepting Salt key on master'
accept_salt_key_remote 2>> "$setup_log" accept_salt_key_remote 2>> "$setup_log"
fi fi
if [[ $is_master ]]; then if [[ $is_master ]]; then
set_progress_str 17 'Accepting Salt key' set_progress_str 20 'Accepting Salt key'
salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1 salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1
fi fi
if [[ $is_node ]]; then
set_progress_str 18 'Setting node type'
set_node_type 2>> "$setup_log"
set_progress_str 19 'Generating search node pillar'
node_pillar 2>> "$setup_log"
fi
set_progress_str 20 'Generating CA and checking in'
salt_checkin 2>> "$setup_log"
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 '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