Fleet standalone fixes

This commit is contained in:
Josh Brower
2020-06-01 16:36:32 -04:00
parent 046bca626e
commit 4b14ecf1d9
7 changed files with 27 additions and 6 deletions

View File

@@ -810,6 +810,17 @@ get_minion_type() {
echo "$minion_type"
}
host_pillar() {
local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
# Create the host pillar
printf '%s\n'\
"host:"\
" mainint: $MNIC"\
"" > "$pillar_file"
}
install_cleanup() {
echo "Installer removing the following files:"
ls -lR "$temp_install_dir"

View File

@@ -128,6 +128,7 @@ elif [ "$install_type" = 'HEAVYNODE' ]; then
is_sensor=true
elif [ "$install_type" = 'FLEET' ]; then
is_minion=true
is_fleet_standalone=true
OSQUERY=1
elif [ "$install_type" = 'HELIXSENSOR' ]; then
is_helix=true
@@ -234,7 +235,7 @@ if [[ $is_master ]]; then
get_redirect
fi
if [[ $is_distmaster || ( $is_sensor || $is_node ) && ! $is_eval ]]; then
if [[ $is_distmaster || ( $is_sensor || $is_node || $is_fleet_standalone ) && ! $is_eval ]]; then
whiptail_master_updates
if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then
whiptail_master_updates_warning
@@ -326,6 +327,10 @@ if [[ $is_minion ]]; then
copy_ssh_key >> $setup_log 2>&1
fi
if [[ $is_fleet_standalone ]]; then
host_pillar >> $setup_log 2>&1
fi
# Begin install
{
# Set initial percentage to 0

View File

@@ -170,7 +170,7 @@ whiptail_create_fleet_node_user() {
[ -n "$TESTING" ] && return
FLEETNODEUSER=$(whiptail --title "Security Onion Install" --inputbox \
"Please enter an email as the username for the Fleet admin user." 10 60 3>&1 1>&2 2>&3)
"Please enter an email for use as the username for the Fleet admin user." 10 60 3>&1 1>&2 2>&3)
}