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

Merge pull request #2348 from Security-Onion-Solutions/soup2320

Browse Source 
SOUP Changes
This commit is contained in:
Mike Reeves
2020-12-14 21:19:45 -05:00
committed by GitHub
parent efe44323cb cbd59ed86a
commit bf1f00d2fe
7 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/so-functions
View File

@@ -911,6 +911,7 @@ docker_registry() {
echo "Setting up Docker Registry" >> "$setup_log" 2>&1
mkdir -p /etc/docker >> "$setup_log" 2>&1
# This will get applied so docker can attempt to start
if [ -z "$DOCKERNET" ]; then
DOCKERNET=172.17.0.0
fi

2
setup/so-setup
View File

@@ -384,7 +384,6 @@ if [[ ! $is_import ]]; then
fi
whiptail_homenet_manager
whiptail_dockernet_check
if [[ $is_helix || $is_manager || $is_node || $is_import ]]; then
set_base_heapsizes
@@ -419,6 +418,7 @@ fi
if [[ $is_manager ]]; then
whiptail_components_adv_warning
whiptail_enable_components
whiptail_dockernet_check
fi
if [[ $is_manager || $is_import ]]; then

2
setup/so-whiptail
View File

@@ -426,7 +426,7 @@ whiptail_dockernet_net() {
[ -n "$TESTING" ] && return
DOCKERNET=$(whiptail --title "Security Onion Setup" --inputbox \
"\nEnter a /24 network range for docker to use: \nThe same range MUST be used on ALL nodes \n(Default value is pre-populated.)" 10 75 172.17.0.0 3>&1 1>&2 2>&3)
"\nEnter a /24 size network range for docker to use WITHOUT the /24 notation: \nThis range will be used on ALL nodes \n(Default value is pre-populated.)" 10 75 172.17.0.0 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus