Set proxy, replace when setting up yum for manager proxy

This commit is contained in:
William Wernert
2021-04-21 16:18:20 -04:00
parent f3d663f090
commit c1ae7ff3b6

View File

@@ -2410,15 +2410,13 @@ 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 # 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'\ "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
@@ -2687,7 +2685,11 @@ set_updates() {
if [ "$MANAGERUPDATES" = '1' ]; then if [ "$MANAGERUPDATES" = '1' ]; then
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
if [[ ! $is_airgap ]] && ! ( 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 if grep -q "proxy="; then
sed -i "s/proxy=.*/proxy=http:\/\/$MSRV:3142/"
else
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