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

Revert all proxy changes on reinstall

Browse Source
This commit is contained in:
William Wernert
2021-03-15 12:34:13 -04:00
parent f80dfda60b
commit 6ae3a26cbe
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup/so-functions
View File

@@ -1946,6 +1946,24 @@ reinstall_init() {
} >> "$setup_log" 2>&1
}
reset_proxy() {
[[ -f /etc/profile.d/so-proxy.sh ]] && rm -f /etc/profile.d/so-proxy.sh
[[ -f /etc/systemd/system/docker.service.d/http-proxy.conf ]] && rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
systemctl daemon-reload
command -v docker &> /dev/null && systemctl restart docker
[[ -f /root/.docker/config.json ]] && rm -f /root/.docker/config.json
[[ -f /etc/gitconfig ]] && rm -f /etc/gitconfig
if [[ $OS == 'centos' ]]; then
sed -i "/proxy=/d" /etc/yum.conf
else
[[ -f /etc/apt/apt.conf.d/00-proxy.conf ]] && rm -f /etc/apt/apt.conf.d/00-proxy.conf
fi
}
backup_dir() {
dir=$1
backup_suffix=$2

15
setup/so-setup
View File

@@ -205,14 +205,15 @@ if ! [[ -f $install_opt_file ]]; then
whiptail_first_menu_iso
if [[ $option == "CONFIGURENETWORK" ]]; then
collect_hostname
reset_prpxy >> $setup_log 2>&1
collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
network_init_whiptail
whiptail_management_interface_setup
network_init
printf '%s\n' \
"MNIC=$MNIC" \
"HOSTNAME=$HOSTNAME" > "$net_init_file"
collect_proxy
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
whiptail_net_setup_complete
else
true
@@ -276,9 +277,13 @@ if [[ $is_minion ]]; then
collect_mngr_hostname
fi
if ! [[ -f $install_opt_file ]] && [[ -z $is_airgap ]]; then
collect_proxy_details
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
if ! [[ -f $install_opt_file ]]; then
reset_prpxy >> $setup_log 2>&1 # Always reset proxy when answer file doesn't exist
if [[ -z $is_airgap ]]; then
collect_proxy_details
[[ -n "$so_proxy" ]] && set_proxy >> $setup_log 2>&1
fi
fi
percentage=0