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

Revert "[wip] Change when proxy is set up so main ip is known"

Browse Source 
This reverts commit 1ea3cb1c61.

# Conflicts:
#	setup/so-functions
This commit is contained in:
William Wernert
2021-03-08 09:02:53 -05:00
parent 06c584910c
commit ca2766511b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/so-functions
View File

@@ -795,7 +795,7 @@ compare_main_nic_ip() {
error "[ERROR] Main gateway ($MAINIP) does not match ip address of managament NIC ($MNIC_IP)." error "[ERROR] Main gateway ($MAINIP) does not match ip address of managament NIC ($MNIC_IP)."
read -r -d '' message <<- EOM read -r -d '' message <<- EOM
The IP being routed by Linux is not the IP address assigned to the management interface ($MNIC). The IP being routed by Linux is not the IP address assigned to the management interface ($MNIC).
This is not a supported configuration, please remediate and rerun setup. This is not a supported configuration, please remediate and rerun setup.
EOM EOM
@@ -1743,8 +1743,6 @@ network_init() {
if [[ "$setup_type" == 'iso' ]]; then if [[ "$setup_type" == 'iso' ]]; then
set_management_interface set_management_interface
fi fi
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
} }
network_init_whiptail() { network_init_whiptail() {
@@ -2295,7 +2293,7 @@ set_proxy() {
"Environment=\"NO_PROXY=${no_proxy_string}\"" > /etc/systemd/system/docker.service.d/http-proxy.conf "Environment=\"NO_PROXY=${no_proxy_string}\"" > /etc/systemd/system/docker.service.d/http-proxy.conf
systemctl daemon-reload systemctl daemon-reload
command -v docker &> /dev/null && systemctl restart docker systemctl restart docker
# Create config.json for docker containers # Create config.json for docker containers
[[ -d /root/.docker ]] || mkdir /root/.docker [[ -d /root/.docker ]] || mkdir /root/.docker

4
setup/so-setup
View File

@@ -545,7 +545,9 @@ catch() {
exit exit
} }
# Set REDIRECTIT variable, which is used by a function outside the below subshell # This block sets REDIRECTIT which is used by a function outside the below subshell
set_main_ip >> $setup_log 2>&1
compare_main_nic_ip
set_redirect >> $setup_log 2>&1 set_redirect >> $setup_log 2>&1
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1 [[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1