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

Don't set yum/apt proxy if updating through manager

Browse Source
This commit is contained in:
William Wernert
2021-04-21 15:59:37 -04:00
parent d5717b7011
commit f3d663f090
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/so-functions
View File

@@ -2410,6 +2410,7 @@ set_proxy() {
"}" > /root/.docker/config.json "}" > /root/.docker/config.json
# Set proxy for package manager # Set proxy for package manager
if [[ $MANAGERUPDATES != 1 ]]; then
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
echo "proxy=$so_proxy" >> /etc/yum.conf echo "proxy=$so_proxy" >> /etc/yum.conf
else else
@@ -2418,6 +2419,7 @@ set_proxy() {
"Acquire::http::Proxy \"$so_proxy\";"\ "Acquire::http::Proxy \"$so_proxy\";"\
"Acquire::https::Proxy \"$so_proxy\";" > /etc/apt/apt.conf.d/00-proxy.conf "Acquire::https::Proxy \"$so_proxy\";" > /etc/apt/apt.conf.d/00-proxy.conf
fi fi
fi
# Set global git proxy # Set global git proxy
printf '%s\n'\ printf '%s\n'\
@@ -2684,11 +2686,9 @@ set_redirect() {
set_updates() { set_updates() {
if [ "$MANAGERUPDATES" = '1' ]; then if [ "$MANAGERUPDATES" = '1' ]; then
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
if [[ ! $is_airgap ]]; then if [[ ! $is_airgap ]] && ! ( grep -q "$MSRV" /etc/yum.conf); then
if ! grep -q "$MSRV" /etc/yum.conf; then
echo "proxy=http://$MSRV:3142" >> /etc/yum.conf echo "proxy=http://$MSRV:3142" >> /etc/yum.conf
fi fi
fi
else else
# Set it up so the updates roll through the manager # Set it up so the updates roll through the manager
printf '%s\n'\ printf '%s\n'\