diff --git a/defaults.inc b/defaults.inc index 189f95e..e3e85ab 100755 --- a/defaults.inc +++ b/defaults.inc @@ -31,8 +31,8 @@ if [ "${VPN_INTERFACE}" = "nordlynx" ]; then else #VPN_START=(/bin/systemctl start openvpn) #VPN_STOP=(/bin/systemctl stop openvpn) - VPN_START=(/usr/bin/wg-quick up Torguard) - VPN_STOP=(/usr/bin/wg-quick down Torguard) + VPN_START=(/usr/bin/wg-quick up wg-torguard) + VPN_STOP=(/usr/bin/wg-quick down wg-torguard) fi DEBUGLOGSTOP(){ diff --git a/mm-scripts.sh b/mm-scripts.sh index 6780bfe..7e15aa3 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -34,7 +34,7 @@ MMSTART(){ [ $VERBOSE = true ] && chktmstart=`date +%s` if [ "${1}" = "start" ] || [ "${1}" = "" ]; then GOFORSTART=true; - elif [ "${1}" = "check" ] && [ "$(ip link | grep "Torguard")" = "" ] && [ ! -f /opt/idssys/mediamanager/mm.vpn* ]; then + elif [ "${1}" = "check" ] && [ "$(ip link | grep "wg-torguard")" = "" ] && [ ! -f /opt/idssys/mediamanager/mm.vpn* ]; then GOFORSTART=true; [ "${EMAIL_NOTICE}" != "" ] && echo "" | mail -s "Starting Media Management Systems" ${EMAIL_NOTICE} echo "$(date) - Starting Media Management system - (wireguard not running)" >> $logfile @@ -48,7 +48,7 @@ MMSTART(){ OUT=$(ip link | grep "$VPN_INTERFACE") if [ ${#OUT} = 0 ]; then echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel ... ${idsCL[Default]}" - "${VPN_START[@]}" + "${VPN_START[@]}" >/dev/null 2>&1 sleep 10s else echo -en "${idsCL[Green]}The VPN Tunnel is already running ... ${idsCL[Default]}" @@ -70,7 +70,7 @@ MMSTART(){ rm -f /opt/idssys/mediamanager/mm.vpn.fail MMSTOP sleep 5m - "${VPN_START[@]}" & + "${VPN_START[@]}" >/dev/null 2>&1 & sleep 30s rm -f /opt/idssys/mediamanager/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -88,7 +88,7 @@ MMSTART(){ touch /opt/idssys/mediamanager/mm.vpn.fail MMSTOP sleep 30s - "${VPN_START[@]}" & + "${VPN_START[@]}" >/dev/null 2>&1 & sleep 30s rm -f /opt/idssys/mediamanager/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -108,7 +108,8 @@ MMSTART(){ 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 via ${zerogw} + /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 @@ -128,7 +129,7 @@ MMSTART(){ touch /opt/idssys/mediamanager/mm.vpn.fail MMSTOP sleep 2m - "${VPN_START[@]}" & + "${VPN_START[@]}" >/dev/null 2>&1 & sleep 1m rm -f /opt/idssys/mediamanager/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -158,7 +159,7 @@ MMSTART(){ touch /opt/idssys/mediamanager/mm.vpn.fail MMSTOP sleep 2m - "${VPN_START[@]}" & + "${VPN_START[@]}" >/dev/null 2>&1 & sleep 1m rm -f /opt/idssys/mediamanager/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -178,7 +179,7 @@ MMSTART(){ touch /opt/idssys/mediamanager/mm.vpn.fail MMSTOP sleep 2m - "${VPN_START[@]}" & + "${VPN_START[@]}" >/dev/null 2>&1 & sleep 1m rm -f /opt/idssys/mediamanager/mm.stop* [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -292,7 +293,7 @@ MMSTOP(){ echo echo -en "${idsCL[LightCyan]}Stopping VPN Tunnel... ${idsCL[Default]}" - "${VPN_STOP[@]}" + "${VPN_STOP[@]}" >/dev/null 2>&1 checked=false until [ "${checked}" = "" ]; do