[refactor] Use 0/1 for MASTERUPDATES variable

This commit is contained in:
William Wernert
2020-04-18 18:28:02 -04:00
parent 043f2df7e3
commit f801cbe376
3 changed files with 15 additions and 10 deletions

View File

@@ -1430,20 +1430,19 @@ set_node_type() {
}
set_updates() {
echo "MASTERUPDATES is $MASTERUPDATES"
if [ $MASTERUPDATES == 'MASTER' ]; then
if [ $OS == 'centos' ]; then
if [ "$MASTERUPDATES" = 1 ]; then
echo "MASTERUPDATES is MASTER"
if [ $OS = 'centos' ]; then
if ! grep -q $MSRV /etc/yum.conf; then
echo "proxy=http://$MSRV:3142" >> /etc/yum.conf
fi
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
fi
else
echo "MASTERUPDATES is OPEN"
fi
}

View File

@@ -142,7 +142,7 @@ if (whiptail_you_sure) ; then
## Helix ##
####################
if [ $"INSTALLTYPE" == 'HELIXSENSOR' ]; then
MASTERUPDATES=OPEN
MASTERUPDATES=0
filter_unused_nics
[[ "$SKIP_BOND" != 'yes' ]] && whiptail_bond_nics
whiptail_helix_apikey

View File

@@ -942,6 +942,12 @@ whiptail_master_updates() {
"MASTER" "Master node is proxy for OS/Docker updates." ON \
"OPEN" "Each node connect to the Internet for updates" OFF 3>&1 1>&2 2>&3 )
if [ "$MASTERUPDATES" == "MASTER" ]; then
MASTERUPDATES=1
else
MASTERUPDATES=0
fi
local exitstatus=$?
whiptail_check_exitstatus $exitstatus