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

Continued retry implementation for salt-key acceptance; improve timestamp coverage in setup

Browse Source
This commit is contained in:
Jason Ertel
2021-01-10 02:34:46 -05:00
parent 63047b4b85
commit bc8e200919
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -1970,9 +1970,11 @@ set_progress_str() {
echo -e "$percentage_str"
info "Progressing ($percentage%): $progress_bar_text"
printf '%s\n' \
'----'\
info "$percentage% - ${progress_bar_text^^}"\
"$percentage% - ${progress_bar_text^^}"\
"----" >> "$setup_log" 2>&1
}

4
setup/so-setup
View File

@@ -637,12 +637,12 @@ set_redirect >> $setup_log 2>&1
if [[ $is_minion ]]; then
set_progress_str 20 'Accepting Salt key on manager'
retry 20 10 accept_salt_key_remote
retry 20 10 accept_salt_key_remote "going to be accepted"
fi
if [[ $is_manager || $is_import || $is_helix ]]; then
set_progress_str 20 'Accepting Salt key'
retry 20 10 "salt-key -ya $MINION_ID"
retry 20 10 "salt-key -ya $MINION_ID" "going to be accepted"
fi
set_progress_str 21 'Copying minion pillars to manager'