From 8f6a1c2cd4f2b8c1f2ff86e33b1d228dfed31f55 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 10 Jul 2023 18:48:30 -0500
Subject: [PATCH] update

---
 defaults.inc  | 9 +++++++++
 mm-scripts.sh | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/defaults.inc b/defaults.inc
index f1b5ad3..3f49cd2 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -17,6 +17,8 @@ MM_LOGFILE=${LOGFOLDER}/logfile
 MM_OUTPUT_LOGFILE=${LOGFOLDER}/outputs.check.log
 MM_BACKUP_FOLDER='/opt/!MM-Service-Backups'
 
+[ -z ${MM_VPN_RESTART+x} ] && MM_VPN_RESTART=86400
+
 [ ! -f ${MM_LOGFILE} ] && touch ${MM_LOGFILE}
 [ ! -f ${MM_OUTPUT_LOGFILE} ] && touch ${MM_OUTPUT_LOGFILE}
 [ ! -d ${MM_BACKUP_FOLDER} ] && mkdir ${MM_BACKUP_FOLDER}
@@ -176,3 +178,10 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 "
+
+
+
+
+
+
+
diff --git a/mm-scripts.sh b/mm-scripts.sh
index a10d17c..0039fb1 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -178,7 +178,7 @@ MMSTART(){
 		fi
 		
 		vpnuptime=$(expr `date +%s` - $(stat -c %Y ${TMPFOLDER}/vpninfo))
-		if [ ${vpnuptime} -ge 86400 ]; then
+		if [ ${vpnuptime} -ge ${MM_VPN_RESTART} ]; then
 			echo "$(date) - 24hr session limit reached, restarting vpn & services" >> $logfile
 			echo -en "${idsCL[LightCyan]}24hr session limit reached, restarting vpn & services ."
 			[ -f ${TMPFOLDER}/mm.noservices ] && rv="vpn" || rv=""
@@ -1159,6 +1159,9 @@ SERVICERESTORE(){
 	echo
 	
 	fulldate=$(date -r ${BACKUPDIR}/${fcheck}-full.tgz "+%y-%m-%d-%H-%M-%S")
+	IFS='-'; read -a full_date <<< "${fulldate}"; unset IFS
+	[ ${full_date[3]} -gt 12 ] && 
+	fulldate="${full_date[1]}/${full_date[2]}/${full_date[0]} @ ${full_date[3]}:${full_date[4]}"
 	echo -e "[1] ${fulldate} - Full Backup ${fname}"
 	
 	f=2