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] Pipe firstcheckin output to /dev/null

Browse Source
This commit is contained in:
William Wernert
2020-05-04 20:43:42 -04:00
parent 1c0a78e8ad
commit fc2de5a384
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/so-functions
View File

@@ -704,8 +704,7 @@ fireeye_pillar() {
# Run a salt command to generate the minion key # Run a salt command to generate the minion key
salt_firstcheckin() { salt_firstcheckin() {
echo "Next line will show [ERROR], this is expected" >> "$setup_log" 2>&1 salt-call state.show_top >> /dev/null # send output to /dev/null because we don't actually care about the ouput
salt-call state.show_top >> "$setup_log" 2>&1
} }
fleet_pillar() { fleet_pillar() {
@@ -1171,12 +1170,6 @@ salt_checkin() {
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
} }
salt_firstcheckin() {
#First Checkin
salt-call state.highstate >> "$setup_log" 2>&1
}
setup_salt_master_dirs() { setup_salt_master_dirs() {
# Create salt paster directories # Create salt paster directories
mkdir -p /opt/so/saltstack/salt mkdir -p /opt/so/saltstack/salt

8
setup/so-setup
View File

@@ -332,17 +332,17 @@ export percentage=0
fi fi
if [[ $is_master ]]; then if [[ $is_master ]]; then
set_progress_str 21 '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
set_progress_str 22 'Copying minion pillars to master' set_progress_str 21 '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' set_progress_str 22 'Generating CA and checking in'
salt_checkin 2>> "$setup_log" salt_checkin 2>> "$setup_log"
set_progress_str 24 "$(print_salt_state_apply 'schedule')" set_progress_str 23 "$(print_salt_state_apply 'schedule')"
salt-call state.apply -l info schedule >> $setup_log 2>&1 salt-call state.apply -l info schedule >> $setup_log 2>&1