From 89c1d41526ebbbf84444a087914dbb0caf70b0e4 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 27 Jun 2023 22:36:04 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- mm-scripts.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 23490e7..4e2f869 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.240-06172023' +VERS='3.8.241-06272023' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index 4a0c3c5..8a7ee3a 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -42,7 +42,7 @@ cw_spc=40 MMCRONCHECK(){ if [ "$(/bin/ip route show | grep default | cut -d' ' -f 3)" == "" ]; then OUT=$(/bin/ip link | grep "${VPN_INTERFACE}") - [ ${#OUT} = 0 ] && /bin/ip route add default via 10.10.0.1 + [ ${#OUT} = 0 ] && /bin/ip route add default via ${DEFAULT_GW} fi if [ -f ${TMPFOLDER}/mm.stop ]; then @@ -215,7 +215,7 @@ MMSTART(){ /bin/ip route add default dev ${VPN_INTERFACE} /bin/ip route add 0.0.0.0/1 dev ${VPN_INTERFACE} /bin/ip route add 128.0.0.0/1 dev ${VPN_INTERFACE} - /bin/ip route add ${vpn_server_address}/32 via 10.10.0.1 dev eth0 + /bin/ip route add ${vpn_server_address}/32 via ${DEFAULT_GW} dev eth0 echo -e "${idsCL[Green]}Done${idsCL[Default]}" @@ -560,7 +560,7 @@ MMSTOP(){ until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" - [ "$(/bin/ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 + [ "$(/bin/ip route show | grep default | cut -d' ' -f 3)" != "${DEFAULT_GW}" ] && /bin/ip route add default via ${DEFAULT_GW} [ "${vpn_server_address}" != "" ] && /bin/ip route del ${vpn_server_address} [ $VERBOSE = true ] && echo "$(date) - Added default route back in" >> $logfile