From b1cffa1c9f965015ce1f37fca375b884ccd923ad Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 11 Sep 2018 21:17:34 -0400 Subject: [PATCH] SO Setup - Ignore proxy settings if they choose open --- so-setup-network.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index 3dacfdb85..63d74f11b 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -586,18 +586,21 @@ set_initial_firewall_policy() { fi } + set_updates() { + + if [ $MASTERUPDATES == 'MASTER' ]; then + if [ $OS == 'centos' ]; then + echo "proxy=http://$MSRV:3142" >> /etc/yum.conf - if [ $OS == 'centos' ]; then - echo "proxy=http://$MSRV:3142" >> /etc/yum.conf + else - else - - # Set it up so the updates roll through the master - echo "Acquire::http::Proxy \"http://$MSRV:3142\";" > /etc/apt/apt.conf.d/00Proxy - echo "Acquire::https::Proxy \"http://$MSRV:3142\";" >> /etc/apt/apt.conf.d/00Proxy + # Set it up so the updates roll through the master + echo "Acquire::http::Proxy \"http://$MSRV:3142\";" > /etc/apt/apt.conf.d/00Proxy + echo "Acquire::https::Proxy \"http://$MSRV:3142\";" >> /etc/apt/apt.conf.d/00Proxy fi + fi } set_node_type() {