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

move when we check for salt minion update in setup

Browse Source
This commit is contained in:
m0duspwnens
2020-07-30 12:41:09 -04:00
parent 9570efbf8e
commit 8a8705f469
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/so-setup
View File

@@ -457,8 +457,6 @@ fi
if [[ $is_minion ]]; then
set_progress_str 20 'Accepting Salt key on manager'
accept_salt_key_remote >> $setup_log 2>&1
set_progress_str 21 'Checking if the Salt Minion needs to be updated'
salt-call state.apply salt.minion -l info >> $setup_log 2>&1
fi
if [[ $is_manager ]]; then
@@ -466,9 +464,14 @@ fi
salt-key -ya "$MINION_ID" >> $setup_log 2>&1
fi
set_progress_str 22 'Copying minion pillars to manager'
set_progress_str 21 'Copying minion pillars to manager'
copy_minion_tmp_files >> $setup_log 2>&1
if [[ $is_minion ]]; then
set_progress_str 22 'Checking if the Salt Minion needs to be updated'
salt-call state.apply salt.minion -l info >> $setup_log 2>&1
fi
set_progress_str 23 'Generating CA and checking in'
salt_checkin >> $setup_log 2>&1