CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 02:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] Use 0/1 for MASTERUPDATES variable

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/so-functions
View File

@@ -1430,21 +1430,20 @@ set_node_type() {
} }
set_updates() { set_updates() {
echo "MASTERUPDATES is $MASTERUPDATES" if [ "$MASTERUPDATES" = 1 ]; then
if [ $MASTERUPDATES == 'MASTER' ]; then echo "MASTERUPDATES is MASTER"
if [ $OS == 'centos' ]; then if [ $OS = 'centos' ]; then
if ! 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
else else
# Set it up so the updates roll through the master # 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::http::Proxy \"http://$MSRV:3142\";" > /etc/apt/apt.conf.d/00Proxy
echo "Acquire::https::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 fi
else
echo "MASTERUPDATES is OPEN"
fi
} }
set_version() { set_version() {

2
setup/so-setup
View File

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

6
setup/so-whiptail
View File

@@ -942,6 +942,12 @@ whiptail_master_updates() {
"MASTER" "Master node is proxy for OS/Docker updates." ON \ "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 ) "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=$? local exitstatus=$?
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus