diff --git a/mm-scripts.sh b/mm-scripts.sh index 7e15aa3..ce7f6a0 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -96,51 +96,49 @@ MMSTART(){ fi else - - zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) - defaultgw=$(ip route show | grep default | cut -d' ' -f 3) - if [ ${GOFORSTART} = true ]; then echo -e "${idsCL[Green]} done${idsCL[Default]}" fi - if [ "${zerogw}" != "${defaultgw}" ]; then - echo "$(date) - Adding VPN default routes" >> $logfile - echo -en "${idsCL[LightCyan]}Adding VPN default routes... ${idsCL[Default]}" - /bin/ip route del default via 10.10.0.1 - /bin/ip route add default dev wg-torguard - /bin/ip route add 0.0.0.0/1 dev wg-torguard - echo -e "${idsCL[Green]} done${idsCL[Default]}" - fi + zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) + defaultgw=$(ip route show | grep default | cut -d' ' -f 3) - + # if [ "${zerogw}" != "${defaultgw}" ]; then + # echo "$(date) - Adding VPN default routes" >> $logfile + # echo -en "${idsCL[LightCyan]}Adding VPN default routes... ${idsCL[Default]}" + # /bin/ip route del default via 10.10.0.1 + # /bin/ip route add default dev wg-torguard + # /bin/ip route add 0.0.0.0/1 dev wg-torguard + # echo -e "${idsCL[Green]} done${idsCL[Default]}" + # fi - echo -en "${idsCL[LightCyan]}Verifing default network routes... ${idsCL[Default]}" - checked=false - cc=0 - until [ "${checked}" = "" ]; do - if [ "${zerogw}" = "${defaultgw}" ]; then - checked="" - fi - if [ "${checked}" == "false" ] && [ ${cc} -eq 10 ]; then - echo -e "${idsCL[Red]}Could not confirm default routes, restarting system!${idsCL[Default]}" - echo "$(date) - Could not confirm default routes, restarting system" >> $logfile - [ "${EMAIL_NOTICE}" != "" ] && echo "Default route failure, will try and restart the VPN" | mail -s "Network Failure" ${EMAIL_NOTICE} - touch /opt/idssys/mediamanager/mm.vpn.fail - MMSTOP - sleep 2m - "${VPN_START[@]}" >/dev/null 2>&1 & - sleep 1m - rm -f /opt/idssys/mediamanager/mm.stop* - [ $VERBOSE = true ] && DEBUGLOGSTOP - exit 1 - fi - ((cc=${cc}+1)) - sleep 1s - zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) - defaultgw=$(ip route show | grep default | cut -d' ' -f 3) - done - echo -e "${idsCL[Green]} done${idsCL[Default]}" + + # echo -en "${idsCL[LightCyan]}Verifing default network routes... ${idsCL[Default]}" + # checked=false + # cc=0 + # until [ "${checked}" = "" ]; do + # if [ "${zerogw}" = "${defaultgw}" ]; then + # checked="" + # fi + # if [ "${checked}" == "false" ] && [ ${cc} -eq 10 ]; then + # echo -e "${idsCL[Red]}Could not confirm default routes, restarting system!${idsCL[Default]}" + # echo "$(date) - Could not confirm default routes, restarting system" >> $logfile + # [ "${EMAIL_NOTICE}" != "" ] && echo "Default route failure, will try and restart the VPN" | mail -s "Network Failure" ${EMAIL_NOTICE} + # touch /opt/idssys/mediamanager/mm.vpn.fail + # MMSTOP + # sleep 2m + # "${VPN_START[@]}" >/dev/null 2>&1 & + # sleep 1m + # rm -f /opt/idssys/mediamanager/mm.stop* + # [ $VERBOSE = true ] && DEBUGLOGSTOP + # exit 1 + # fi + # ((cc=${cc}+1)) + # sleep 1s + # zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) + # defaultgw=$(ip route show | grep default | cut -d' ' -f 3) + # done + # echo -e "${idsCL[Green]} done${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Verifing traffic is routing through VPN... ${idsCL[Default]}" @@ -304,8 +302,8 @@ MMSTOP(){ fi done - [ "$(ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 - [ $VERBOSE = true ] && echo "$(date) - Added default route back in" >> $logfile + # [ "$(ip route show | grep default | cut -d' ' -f 3)" != "10.10.0.1" ] && /bin/ip route add default via 10.10.0.1 + # [ $VERBOSE = true ] && echo "$(date) - Added default route back in" >> $logfile echo -e "${idsCL[Green]} done${idsCL[Default]}" echo "$(date) - Media Management systems stopped" >> $logfile @@ -350,24 +348,22 @@ MMSTATUS(){ else echo -e "${idsCL[Green]}Running${idsCL[Default]}" if [[ ${srvc} == *"vpn"* ]]; then - # zerogw=$(netstat -rn | grep '0.0.0.0' | head -1 | awk '{ print $2}') - # defaultgw=$(netstat -rn | grep 'default' | head -1 | awk '{ print $2}') - zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) - defaultgw=$(ip route show | grep default | cut -d' ' -f 3) - echo -e " |- 0.0.0.0 gateway --> (${zerogw})" - echo -en " |- DEFAULT gateway --> (${defaultgw}) : " - if [ "${zerogw}" = "${defaultgw}" ]; then - echo -e "${idsCL[Green]}Matches 0.0.0.0 route${idsCL[Default]}" - else - echo -e "${idsCL[Red]}Does not match 0.0.0.0 route${idsCL[Default]}" - if [ ! -f /opt/idssys/mediamanager/mm.stop ]; then - echo - echo -e "${idsCL[LightCyan]}Restarting system...${idsCL[Default]}" - MMSTOP - sleep 30s - MMSTART - fi - fi + # zerogw=$(ip route show | grep 0.0.0.0 | cut -d' ' -f 3) + # defaultgw=$(ip route show | grep default | cut -d' ' -f 3) + # echo -e " |- 0.0.0.0 gateway --> (${zerogw})" + # echo -en " |- DEFAULT gateway --> (${defaultgw}) : " + # if [ "${zerogw}" = "${defaultgw}" ]; then + # echo -e "${idsCL[Green]}Matches 0.0.0.0 route${idsCL[Default]}" + # else + # echo -e "${idsCL[Red]}Does not match 0.0.0.0 route${idsCL[Default]}" + # if [ ! -f /opt/idssys/mediamanager/mm.stop ]; then + # echo + # echo -e "${idsCL[LightCyan]}Restarting system...${idsCL[Default]}" + # MMSTOP + # sleep 30s + # MMSTART + # fi + # fi echo -en " |- Verify traffic route to VPN -> : " scip=$(dig +short sc1.scity.us @9.9.9.9)