Fleet standalone fixes

This commit is contained in:
Josh Brower
2020-05-28 16:27:18 -04:00
parent aeb71bb8f0
commit 0d8c0e1fa6
3 changed files with 69 additions and 2 deletions

View File

@@ -481,9 +481,16 @@ fi
set_progress_str 73 "$(print_salt_state_apply 'redis')"
salt-call state.apply -l info redis >> $setup_log 2>&1
if [ "$install_type" = 'FLEET' ]; then
collect_fleetuser_inputs
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
set_progress_str 74 "$(print_salt_state_apply 'so-fleet-setup')"
so-fleet-setup $WEBUSER $WEBPASSWD1 >> $setup_log 2>&1
fi
if [[ "$WAZUH" = 1 ]]; then