Merge pull request #891 from Security-Onion-Solutions/feature/navigator-to-nginx

Feature/navigator to nginx
This commit is contained in:
William Wernert
2020-06-26 15:48:46 -04:00
committed by GitHub
23 changed files with 1171 additions and 1222 deletions

View File

@@ -50,7 +50,6 @@ MNIC=eth0
# MSEARCH=
# MSRV=
# MTU=
NAVIGATOR=1
NIDS=Suricata
# NODE_ES_HEAP_SIZE=
# NODE_LS_HEAP_SIZE=

View File

@@ -718,7 +718,6 @@ docker_seed_registry() {
"so-influxdb:$VERSION" \
"so-kibana:$VERSION" \
"so-mysql:$VERSION" \
"so-navigator:$VERSION" \
"so-playbook:$VERSION" \
"so-soc:$VERSION" \
"so-kratos:$VERSION" \
@@ -910,7 +909,6 @@ master_pillar() {
" osquery: $OSQUERY"\
" thehive: $THEHIVE"\
" playbook: $PLAYBOOK"\
" navigator: $NAVIGATOR"\
" url_base: $REDIRECTIT"\
""\
"kratos:" >> "$pillar_file"

View File

@@ -561,11 +561,6 @@ fi
salt-call state.apply -l info playbook >> $setup_log 2>&1
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
set_progress_str 81 "$(print_salt_state_apply 'utility')"
salt-call state.apply -l info utility >> $setup_log 2>&1

View File

@@ -343,7 +343,6 @@ whiptail_enable_components() {
WAZUH "Enable Wazuh" ON \
THEHIVE "Enable TheHive" ON \
PLAYBOOK "Enable Playbook" ON \
NAVIGATOR "Enable ATT&CK Navigator" ON \
STRELKA "Enable Strelka" ON 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus