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

This commit is contained in:
William Wernert
2021-04-21 15:59:37 -04:00
parent d5717b7011
commit f3d663f090

View File

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