diff --git a/defaults.inc b/defaults.inc index 56a0098..27a960c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.9.72-05292024' +VERS='3.9.73-07142024' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" @@ -24,6 +24,7 @@ MM_BACKUP_FOLDER='/opt/!MM-Service-Backups' [ ! -d ${MM_BACKUP_FOLDER} ] && mkdir ${MM_BACKUP_FOLDER} IFS=, +ADD_ROUTES=(${ADDROUTES}) AVAIL_SERVICES=(${AVAILSERVICES}) UPDATE_SERVICES=(${UPDATESERVICES}) SERVICES_CHECK=(${SERVICESCHECK}) diff --git a/mm-scripts.sh b/mm-scripts.sh index cd8c0d3..411addc 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -225,6 +225,12 @@ MMSTART(){ /bin/ip route add 128.0.0.0/1 dev ${VPN_INTERFACE} /bin/ip route add ${vpn_server_address}/32 via ${DEFAULT_GW} dev eth0 + if [ "${ADDROUTES}" != "" ]; then + for route in "${ADD_ROUTES[@]}"; do + /bin/ip route add ${route} via ${DEFAULT_GW} dev eth0 + done + fi + echo -e "${idsCL[Green]}Done${idsCL[Default]}" zerogw=$(/bin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) @@ -570,7 +576,12 @@ MMSTOP(){ [ "$(/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" >> ${MM_LOGFILE} + if [ "${ADDROUTES}" != "" ]; then + for route in "${ADD_ROUTES[@]}"; do + /bin/ip route del ${route} via ${DEFAULT_GW} dev eth0 + done + fi + [ $VERBOSE = true ] && echo "$(date) - Added default routes back in" >> ${MM_LOGFILE} echo -e "${idsCL[Green]}Done${idsCL[Default]}"