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

@@ -246,6 +246,10 @@ check_soremote_pass() {
check_pass_match "$SOREMOTEPASS1" "$SOREMOTEPASS2" "SCMATCH"
}
check_fleet_node_pass() {
check_pass_match "$FLEETNODEPASSWD1" "$FLEETNODEPASSWD2" "fpMATCH"
}
check_web_pass() {
check_pass_match "$WEBPASSWD1" "$WEBPASSWD2" "WPMATCH"
}
@@ -283,6 +287,30 @@ collect_adminuser_inputs() {
done
}
collect_fleetuser_inputs() {
# Get a username & password for the Fleet admin user
local valid_user=no
while [[ $valid_user != yes ]]; do
whiptail_create_fleet_node_user
if so-user valemail "$FLEETNODEUSER" >> "$setup_log" 2>&1; then
valid_user=yes
else
whiptail_invalid_user_warning
fi
done
FPMATCH=no
while [[ $FPMATCH != yes ]]; do
whiptail_create_fleet_node_user_password1
if echo "$FLEETNODEPASSWD1" | so-user valpass >> "$setup_log" 2>&1; then
whiptail_create_fleet_node_user_password2
check_fleet_node_pass
else
whiptail_invalid_pass_warning
fi
done
}
collect_webuser_inputs() {
# Get a password for the web admin user