From 7744e2f092429a166af66d6595256ebf0a9e3031 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 16 Nov 2023 21:45:46 -0600
Subject: [PATCH] Update vpnmon.sh

---
 vpnmon.sh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/vpnmon.sh b/vpnmon.sh
index c5bb231..2506a50 100755
--- a/vpnmon.sh
+++ b/vpnmon.sh
@@ -9,17 +9,17 @@ logfile=/opt/idssys/vpnmon/logfile
 touch $logfile
 
 START(){
-	
+	touch /opt/idssys/vpnmon/vpn.stop
 	sudo mkdir -p /var/run/xl2tpd
 	sudo touch /var/run/xl2tpd/l2tp-control
 	[ "$(systemctl list-units --full -all | grep "strongswan.service")" != "" ] && sudo service strongswan restart
 	[ "$(systemctl list-units --full -all | grep "strongswan-starter.service")" != "" ] && sudo service strongswan-starter restart
 	sudo systemctl restart xl2tpd ipsec
+	sleep 3s
+	sudo /usr/sbin/ipsec up ${VPN_CFGNAME}
 	sleep 4s
-	sudo /usr/sbin/ipsec up ${VPN_NAME}
-	sleep 4s
-	sudo echo "c ${VPN_NAME}" > /var/run/xl2tpd/l2tp-control
-	sleep 4s
+	sudo echo "c ${VPN_CFGNAME}" > /var/run/xl2tpd/l2tp-control
+	sleep 5s
 	
 	[ "${ROUTE_SUBNET1}" != "" ] && ip route add ${ROUTE_SUBNET1} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
 	[ "${ROUTE_SUBNET2}" != "" ] && ip route add ${ROUTE_SUBNET2} via $(ip address show dev ppp0 | grep -Po '(?<=peer )(\b([0-9]{1,3}\.){3}[0-9]{1,3}\b)') dev ppp0
@@ -43,10 +43,9 @@ STOP(){
 	# 	/usr/sbin/service unifi-poller stop
 	# fi
 	
-	# sudo bash -c 'echo "d ${VPN_NAME}" > /var/run/xl2tpd/l2tp-control'
-	sudo echo "d ${VPN_NAME}" > /var/run/xl2tpd/l2tp-control
+	sudo echo "d ${VPN_CFGNAME}" > /var/run/xl2tpd/l2tp-control
 	sleep 4s
-	/usr/sbin/ipsec down ${VPN_NAME}
+	/usr/sbin/ipsec down ${VPN_CFGNAME}
 	
 	echo "$(date) - VPN stopped" >> $logfile
 
@@ -54,14 +53,11 @@ STOP(){
 CHECK(){
 	
 	if [ ! -f /opt/idssys/vpnmon/vpn.stop ]; then
-	
 		touch /opt/idssys/vpnmon/vpn.stop
-		
 		checked=false
 		cc=0
 		until [ "${checked}" = "" ]; do
-			OUT=$(ip link | grep "ppp0")			
-			#OUT=`ip a show $VPN_INTERFACE up` >/dev/null 2>&1
+			OUT=$(ip link | grep "${VPN_INTERFACE}")			
 			if [ ${#OUT} -ne 0 ]; then
 				checked=""
 			elif [ ${cc} -eq 10 ]; then			
@@ -96,7 +92,6 @@ CHECK(){
 			echo "$(date) - VPN Fixed" >> $logfile
 			rm -f /opt/idssys/vpnmon/vpn.fail*
 		fi
-
 		
 	else
 		echo "VPN system is stopped and must be restarted manually"