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

[refactor] Remove is_smooshed var

Browse Source
This commit is contained in:
William Wernert
2020-12-08 15:29:48 -05:00
parent 813fe77582
commit a8f1ec37a3
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/so-setup
View File

@@ -176,7 +176,6 @@ elif [ "$install_type" = 'STANDALONE' ]; then
is_distmanager=true is_distmanager=true
is_node=true is_node=true
is_sensor=true is_sensor=true
is_smooshed=true
elif [ "$install_type" = 'MANAGERSEARCH' ]; then elif [ "$install_type" = 'MANAGERSEARCH' ]; then
is_manager=true is_manager=true
is_distmanager=true is_distmanager=true
@@ -194,7 +193,6 @@ elif [ "$install_type" = 'HEAVYNODE' ]; then
is_node=true is_node=true
is_minion=true is_minion=true
is_sensor=true is_sensor=true
is_smooshed=true
elif [ "$install_type" = 'FLEET' ]; then elif [ "$install_type" = 'FLEET' ]; then
is_minion=true is_minion=true
is_fleet_standalone=true is_fleet_standalone=true

14
setup/so-whiptail
View File

@@ -35,7 +35,7 @@ whiptail_basic_zeek() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
if [[ $is_smooshed ]]; then if [[ $is_node && $is_sensor && ! $is_eval ]]; then
local PROCS=$(expr $lb_procs / 2) local PROCS=$(expr $lb_procs / 2)
if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi
else else
@@ -53,7 +53,7 @@ whiptail_basic_suri() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
if [[ $is_smooshed ]]; then if [[ $is_node && $is_sensor && ! $is_eval ]];; then
local PROCS=$(expr $lb_procs / 2) local PROCS=$(expr $lb_procs / 2)
if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi
else else
@@ -77,7 +77,7 @@ whiptail_zeek_pins() {
cpu_core_list_whiptail+=("$item" "OFF") cpu_core_list_whiptail+=("$item" "OFF")
done done
if [[ $is_smooshed ]]; then if [[ $is_node && $is_sensor && ! $is_eval ]];; then
local PROCS=$(expr $lb_procs / 2) local PROCS=$(expr $lb_procs / 2)
if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi
else else
@@ -1354,11 +1354,11 @@ whiptail_suricata_pins() {
readarray -t filtered_core_list <<< "$(echo "${cpu_core_list[@]}" "${ZEEKPINS[@]}" | xargs -n1 | sort | uniq -u | awk '{print $1}')" readarray -t filtered_core_list <<< "$(echo "${cpu_core_list[@]}" "${ZEEKPINS[@]}" | xargs -n1 | sort | uniq -u | awk '{print $1}')"
local filtered_core_str=() local filtered_core_str=()
for item in "${filtered_core_list[@]}"; do for item in "${filtered_core_list[@]}"; do
filtered_core_str+=("$item" "") filtered_core_str+=("$item" "")
done done
if [[ $is_smooshed ]]; then if [[ $is_node && $is_sensor && ! $is_eval ]];; then
local PROCS=$(expr $lb_procs / 2) local PROCS=$(expr $lb_procs / 2)
if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi if [ "$PROCS" -lt 1 ]; then PROCS=1; else PROCS=$PROCS; fi
else else