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

Fleet standalone fixes - fleet sa req

Browse Source
This commit is contained in:
Josh Brower
2020-06-02 10:20:29 -04:00
parent b5cc653179
commit 77df87880c
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -398,13 +398,11 @@ check_requirements() {
req_mem=12 req_mem=12
req_cores=4 req_cores=4
req_nics=2 req_nics=2
elif [[ "$eval_or_dist" == 'fleet' ]]; then
req_mem=4
req_cores=4
elif [[ "$eval_or_dist" == 'dist' ]]; then elif [[ "$eval_or_dist" == 'dist' ]]; then
req_mem=8 req_mem=8
req_cores=4 req_cores=4
if [[ "$node_type" == 'sensor' ]]; then req_nics=2; else req_nics=1; fi if [[ "$node_type" == 'sensor' ]]; then req_nics=2; else req_nics=1; fi
if [[ "$node_type" == 'fleet' ]]; then req_mem=4; fi
fi fi
if [[ $num_nics -lt $req_nics ]]; then if [[ $num_nics -lt $req_nics ]]; then

9
setup/so-setup
View File

@@ -128,7 +128,6 @@ elif [ "$install_type" = 'HEAVYNODE' ]; then
is_sensor=true is_sensor=true
elif [ "$install_type" = 'FLEET' ]; then elif [ "$install_type" = 'FLEET' ]; then
is_minion=true is_minion=true
is_fleet_standalone=true
OSQUERY=1 OSQUERY=1
elif [ "$install_type" = 'HELIXSENSOR' ]; then elif [ "$install_type" = 'HELIXSENSOR' ]; then
is_helix=true is_helix=true
@@ -136,10 +135,10 @@ fi
if [[ $is_eval ]]; then if [[ $is_eval ]]; then
check_requirements "eval" check_requirements "eval"
elif [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
check_requirements "dist" "fleet"
elif [[ $is_distmaster || $is_minion ]]; then elif [[ $is_distmaster || $is_minion ]]; then
check_requirements "dist" check_requirements "dist"
elif [[ $is_fleet_standalone ]]; then
check_requirements "fleet"
elif [[ $is_sensor && ! $is_eval ]]; then elif [[ $is_sensor && ! $is_eval ]]; then
check_requirements "dist" "sensor" check_requirements "dist" "sensor"
fi fi
@@ -237,7 +236,7 @@ if [[ $is_master ]]; then
get_redirect get_redirect
fi fi
if [[ $is_distmaster || ( $is_sensor || $is_node || $is_fleet_standalone ) && ! $is_eval ]]; then if [[ $is_distmaster || ( $is_sensor || $is_node || [[ "$is_minon" && "$OSQUERY" == 1 ]] ) && ! $is_eval ]]; then
whiptail_master_updates whiptail_master_updates
if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then if [[ $setup_type == 'network' && $MASTERUPDATES == 1 ]]; then
whiptail_master_updates_warning whiptail_master_updates_warning
@@ -329,7 +328,7 @@ if [[ $is_minion ]]; then
copy_ssh_key >> $setup_log 2>&1 copy_ssh_key >> $setup_log 2>&1
fi fi
if [[ $is_fleet_standalone ]]; then if [[ "$is_minon" && "$OSQUERY" == 1 ]]; then
host_pillar >> $setup_log 2>&1 host_pillar >> $setup_log 2>&1
fi fi