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

Fleet standalone bugfixes

Browse Source
This commit is contained in:
Josh Brower
2020-05-28 16:40:12 -04:00
parent 0d8c0e1fa6
commit e8e48a4beb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
setup/so-setup
View File

@@ -283,6 +283,13 @@ if [[ $is_node && ! $is_eval ]]; then
fi fi
fi fi
if [ "$install_type" = 'FLEET' ]; then
collect_fleetuser_inputs
else
FLEETNODEUSER=$WEBUSER
FLEETNODEPASSWD1=$WEBPASSWD1
fi
whiptail_make_changes whiptail_make_changes
if [[ -n "$TURBO" ]]; then if [[ -n "$TURBO" ]]; then
@@ -482,14 +489,8 @@ fi
set_progress_str 73 "$(print_salt_state_apply 'redis')" set_progress_str 73 "$(print_salt_state_apply 'redis')"
salt-call state.apply -l info redis >> $setup_log 2>&1 salt-call state.apply -l info redis >> $setup_log 2>&1
if [ "$install_type" = 'FLEET' ]; then set_progress_str 74 "$(print_salt_state_apply 'so-fleet-setup')"
collect_fleetuser_inputs so-fleet-setup $FLEETNODEUSER $FLEETNODEPASSWD1 >> $setup_log 2>&1
set_progress_str 74 "$(print_salt_state_apply 'so-fleet-setup')"
so-fleet-setup $FLEETNODEUSER $FLEETNODEPASSWD1 >> $setup_log 2>&1
else
set_progress_str 74 "$(print_salt_state_apply 'so-fleet-setup')"
so-fleet-setup $WEBUSER $WEBPASSWD1 >> $setup_log 2>&1
fi
fi fi