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 branch 'dev' into feature/setup

Browse Source 
# Conflicts:
#	setup/so-setup
This commit is contained in:
William Wernert
2020-07-10 18:41:24 -04:00
parent aee304e5d5 f9c8f8cdca
commit 056b3a0629
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/so-setup
View File

@@ -58,7 +58,6 @@ function progress() {
fi fi
export SO_ERROR=1 export SO_ERROR=1
export SKIP_REBOOT=1
title="Error found, please check $setup_log" title="Error found, please check $setup_log"
fi fi
@@ -622,7 +621,9 @@ if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then
IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1 IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
fi fi
if [[ $success != 0 || -n $SO_ERROR ]]; then whiptail_setup_failed if [[ $success != 0 || $SO_ERROR == 1 ]]; then
SKIP_REBOOT=1
whiptail_setup_failed
else else
whiptail_setup_complete whiptail_setup_complete
if [[ $THEHIVE == 1 ]]; then check_hive_init; fi if [[ $THEHIVE == 1 ]]; then check_hive_init; fi