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

Merge pull request #649 from Security-Onion-Solutions/bugfix/playbook-mysql

Browse Source 
navigator fixes
This commit is contained in:
Josh Brower
2020-05-10 11:58:39 -04:00
committed by GitHub
parent 4977a8b17c 20e7331bb9
commit 945d50cc13
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/top.sls
View File

@@ -2,6 +2,7 @@
{%- set WAZUH = salt['pillar.get']('static:wazuh', '0') -%} {%- set WAZUH = salt['pillar.get']('static:wazuh', '0') -%}
{%- set THEHIVE = salt['pillar.get']('master:thehive', '0') -%} {%- set THEHIVE = salt['pillar.get']('master:thehive', '0') -%}
{%- set PLAYBOOK = salt['pillar.get']('master:playbook', '0') -%} {%- set PLAYBOOK = salt['pillar.get']('master:playbook', '0') -%}
{%- set NAVIGATOR = salt['pillar.get']('master:navigator', '0') -%}
{%- set FREQSERVER = salt['pillar.get']('master:freq', '0') -%} {%- set FREQSERVER = salt['pillar.get']('master:freq', '0') -%}
{%- set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') -%} {%- set DOMAINSTATS = salt['pillar.get']('master:domainstats', '0') -%}
{%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%} {%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%}
@@ -68,7 +69,9 @@ base:
- firewall - firewall
- idstools - idstools
- healthcheck - healthcheck
{%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
- mysql - mysql
{%- endif %}
{%- if WAZUH != 0 %} {%- if WAZUH != 0 %}
- wazuh - wazuh
{%- endif %} {%- endif %}
@@ -97,6 +100,9 @@ base:
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != 0 %}
- playbook - playbook
{%- endif %} {%- endif %}
{%- if NAVIGATOR != 0 %}
- navigator
{%- endif %}
{%- if FREQSERVER != 0 %} {%- if FREQSERVER != 0 %}
- freqserver - freqserver
{%- endif %} {%- endif %}
@@ -119,7 +125,7 @@ base:
- master - master
- idstools - idstools
- redis - redis
{%- if FLEETMASTER or FLEETNODE %} {%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
- mysql - mysql
{%- endif %} {%- endif %}
{%- if WAZUH != 0 %} {%- if WAZUH != 0 %}
@@ -230,7 +236,7 @@ base:
- master - master
- idstools - idstools
- redis - redis
{%- if FLEETMASTER or FLEETNODE %} {%- if FLEETMASTER or FLEETNODE or PLAYBOOK != 0 %}
- mysql - mysql
{%- endif %} {%- endif %}
{%- if WAZUH != 0 %} {%- if WAZUH != 0 %}

1
setup/so-functions
View File

@@ -827,6 +827,7 @@ master_pillar() {
" wazuh: $WAZUH"\ " wazuh: $WAZUH"\
" thehive: $THEHIVE"\ " thehive: $THEHIVE"\
" playbook: $PLAYBOOK"\ " playbook: $PLAYBOOK"\
" navigator: $NAVIGATOR"\
" strelka: $STRELKA"\ " strelka: $STRELKA"\
""\ ""\
"kratos:" >> "$pillar_file" "kratos:" >> "$pillar_file"

5
setup/so-setup
View File

@@ -427,6 +427,11 @@ export percentage=0
salt-call state.apply -l info playbook >> $setup_log 2>&1 salt-call state.apply -l info playbook >> $setup_log 2>&1
fi fi
if [[ "$NAVIGATOR" = 1 ]]; then
set_progress_str 78 "$(print_salt_state_apply 'navigator')"
salt-call state.apply -l info navigator >> $setup_log 2>&1
fi
if [[ $is_master || $is_helix ]]; then if [[ $is_master || $is_helix ]]; then
set_progress_str 79 "$(print_salt_state_apply 'master')" set_progress_str 79 "$(print_salt_state_apply 'master')"
salt-call state.apply -l info master >> $setup_log 2>&1 salt-call state.apply -l info master >> $setup_log 2>&1

3
setup/so-whiptail
View File

@@ -138,7 +138,7 @@ whiptail_create_admin_user() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
ADMINUSER=$(whiptail --title "Security Onion Install" --inputbox \ ADMINUSER=$(whiptail --title "Security Onion Install" --inputbox \
"Please enter a username for your new admin user. The onion account will be disabled during this install" 10 60 3>&1 1>&2 2>&3) "Please enter a username for a new system admin user. The local onion account will be disabled during this install" 10 60 3>&1 1>&2 2>&3)
} }
@@ -298,6 +298,7 @@ whiptail_enable_components() {
WAZUH "Enable Wazuh" ON \ WAZUH "Enable Wazuh" ON \
THEHIVE "Enable TheHive" ON \ THEHIVE "Enable TheHive" ON \
PLAYBOOK "Enable Playbook" ON \ PLAYBOOK "Enable Playbook" ON \
NAVIGATOR "Enable ATT&CK Navigator" ON \
STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3) STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3)
local exitstatus=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus