CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-11 11:42:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fleet standalone fixes - firewall

Browse Source
This commit is contained in:
Josh Brower
2020-06-02 08:05:48 -04:00
parent 4b14ecf1d9
commit b695b7f245
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/firewall/init.sls
View File

@@ -6,7 +6,8 @@
{% elif grains['role'] == 'so-sensor' %} {% elif grains['role'] == 'so-sensor' %}
{% set ip = salt['pillar.get']('sensor:mainip', '') %} {% set ip = salt['pillar.get']('sensor:mainip', '') %}
{% elif grains['role'] == 'so-fleet' %} {% elif grains['role'] == 'so-fleet' %}
{% set ip = salt['pillar.get']('node:mainip', '') %} {% set MAININT = salt['pillar.get']('host:mainint') %}
{% set ip = salt['grains.get']('ip_interfaces').get(MAININT)[0] %}
{% endif %} {% endif %}
{% set FLEET_NODE = salt['pillar.get']('static:fleet_node') %} {% set FLEET_NODE = salt['pillar.get']('static:fleet_node') %}

3
setup/so-functions
View File

@@ -398,6 +398,9 @@ 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

4
setup/so-setup
View File

@@ -138,6 +138,8 @@ if [[ $is_eval ]]; then
check_requirements "eval" check_requirements "eval"
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
@@ -284,7 +286,7 @@ if [[ $is_node && ! $is_eval ]]; then
fi fi
fi fi
if [ "$install_type" = 'FLEET' ]; then if [ "$install_type" == 'FLEET' ]; then
collect_fleetuser_inputs collect_fleetuser_inputs
else else
FLEETNODEUSER=$WEBUSER FLEETNODEUSER=$WEBUSER

4
setup/so-whiptail
View File

@@ -178,7 +178,7 @@ whiptail_create_fleet_node_user_password1() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
FLEETNODEPASS1=$(whiptail --title "Security Onion Install" --passwordbox \ FLEETNODEPASSWD1=$(whiptail --title "Security Onion Install" --passwordbox \
"Enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3) "Enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3)
local exitstatus=$? local exitstatus=$?
@@ -189,7 +189,7 @@ whiptail_create_fleet_node_user_password2() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
FLEETNODEPASS2=$(whiptail --title "Security Onion Install" --passwordbox \ FLEETNODEPASSWD2=$(whiptail --title "Security Onion Install" --passwordbox \
"Re-enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3) "Re-enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3)
local exitstatus=$? local exitstatus=$?