diff --git a/defaults.inc b/defaults.inc index dd098ac..d34db23 100755 --- a/defaults.inc +++ b/defaults.inc @@ -22,15 +22,14 @@ NM_SERVICES['ombi']='Ombi (Download Requester)' #if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"10.10.1.24"* ]]; then if [ "${VPN_INTERFACE}" = "nordlynx" ]; then - # VPN_START="/usr/bin/nordvpn connect United_States Chicago" - # VPN_START="/usr/bin/nordvpn connect us9316" - VPN_START="/usr/bin/nordvpn c double_vpn" - VPN_STOP="/usr/bin/nordvpn disconnect" - + # VPN_START=(/usr/bin/nordvpn connect United_States Chicago) + # VPN_START=(/usr/bin/nordvpn connect us9316) + VPN_START=(/usr/bin/nordvpn c double_vpn) + + VPN_STOP=(/usr/bin/nordvpn disconnect) else - VPN_START="/bin/systemctl start openvpn" - VPN_STOP="/bin/systemctl stop openvpn" - + VPN_START=(/bin/systemctl start openvpn) + VPN_STOP=(/bin/systemctl stop openvpn) fi DEBUGLOGSTOP(){ diff --git a/mm-scripts.sh b/mm-scripts.sh index 5029475..1cb3e31 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -288,9 +288,9 @@ MMSTOP(){ fi #/radarr fi #/ombi done - echo -e "${idsCL[Green]} done${idsCL[Default]}" echo + echo -en "${idsCL[LightCyan]}Stopping VPN Tunnel... ${idsCL[Default]}" "${VPN_STOP[@]}" @@ -302,12 +302,12 @@ MMSTOP(){ checked="" fi done - echo "$(date) - Media Management systems stopped" >> $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 echo echo -e "${idsCL[Red]}All services have been stopped${idsCL[Default]}"