From 940183033dea5ddda6dcded83415991bb4be21b2 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 30 Oct 2023 22:18:23 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 nodemgmt-scripts.sh | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 39aa630d..90b0e311 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.12.52-10252023'
+VERS='4.12.60-10252023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 1c9cd8fb..acc42d80 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -578,9 +578,19 @@ UPDATE_DYNDNS(){
 }
 
 BACKUP_OFFSITEPFSENSE(){
+	BAKFOLDER=/mnt/Veeam-pfSense-Backups
 	OFFSITE_PFSENSE_IP='10.2.1.1'
+	
 	if [ "$(CHECK_HOST ${OFFSITE_PFSENSE_IP})" != "false" ]; then
-		BAKFOLDER=/mnt/Veeam-pfSense-Backups
+		if [ ! -f ${BAKFOLDER}/mounted ]; then
+			mount -a
+			sleep 2s
+			if [ ! -f ${BAKFOLDER}/mounted ]; then
+				SENDNOTICE "Offsite pfSense Backup Failed" "Could not mount backup folder '${BAKFOLDER}'"
+				exit 1
+			fi
+		fi
+		
 		newBAKFOLDER=$(date +%Y%m%d-%H%M%S)
 		mkdir ${BAKFOLDER}/${newBAKFOLDER}
 		DOM='01'
@@ -625,9 +635,7 @@ BACKUP_OFFSITEPFSENSE(){
 					keep=1; break
 				fi
 			done;
-			# [ $keep == 0 ] && rm -rf ${folder}
 			[ $keep == 0 ] && delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" && ssh backup@10.10.1.60 rmdir "${delFolder}"
-			# [ $keep == 0 ] && delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" && echo "DELETE FOLDER: ${delFolder}"
 		done
 	else
 		SENDNOTICE "Offsite pfSense Backup Failed" "Could not contact 'pfSense @ ${OFFSITE_PFSENSE_IP}' for backup"