From 63d5042c2acae47664ac4fd78743c709299e0b77 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 4 Sep 2023 15:07:33 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 nodemgmt-scripts.sh | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index c4a72c5c..e4ec6f8a 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.11.15-08262023'
+VERS='4.12.1-09042023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index a6638956..c4d34ed1 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -573,13 +573,27 @@ UPDATE_DYNDNS(){
 
 BACKUP_OFFSITEPFSENSE(){
 	BAKFOLDER=/mnt/BU-Raid1.new/Offsite-pfSense_Backups
-	newBAKFOLDER=${BAKFOLDER}/`date +%Y%m%d-%H%M%S`-D
+	newBAKFOLDER=${BAKFOLDER}/`date +%Y%m%d-%H%M%S`
 	mkdir ${newBAKFOLDER}
 
 	ssh root@10.2.1.1 tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf
 	scp root@10.2.1.1:/cf/conf/conf* ${newBAKFOLDER}/
 	ssh root@10.2.1.1 rm -f /cf/conf/conf_backup.tar.gz
 	
+	if [ "$(date +%d)" == "01" ] && [ "$(date +%u)" == "1" ]; then
+		mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+		ln -s "${newBAKFOLDER}-W" "${newBAKFOLDER}-M"
+		ln -s "${newBAKFOLDER}-D" "${newBAKFOLDER}-M"
+	elif [ "$(date +%d)" == "01" ]; then
+		mv ${newBAKFOLDER} "${newBAKFOLDER}-M"
+		ln -s "${newBAKFOLDER}-D" "${newBAKFOLDER}-M"
+	elif [ "$(date +%u)" == "1" ]; then
+		mv ${newBAKFOLDER} "${newBAKFOLDER}-W"
+		ln -s "${newBAKFOLDER}-D" "${newBAKFOLDER}-W"
+	else
+		mv ${newBAKFOLDER} "${newBAKFOLDER}-D"
+	fi
+		
 	dailyfilestokeep=(`ls  -d ${BAKFOLDER}/*-D 2> /dev/null | tail -7`)
 	weeklyfilestokeep=(`ls -d ${BAKFOLDER}/*-W 2> /dev/null | tail -4`)
 	monthlyfilestokeep=(`ls -d ${BAKFOLDER}/*-M 2> /dev/null | tail -12`)
@@ -599,13 +613,6 @@ BACKUP_OFFSITEPFSENSE(){
 		[ $keep == 0 ] && rm -rf ${i}
 	done
 	
-	if [ "$(date +%u)" == "1" ]; then
-		cp -r ${newBAKFOLDER} ${newBAKFOLDER/-D/-W}
-	fi
-	if [ "$(date +%d)" == "04" ]; then
-		cp -r ${newBAKFOLDER} ${newBAKFOLDER/-D/-M}
-	fi
-	
 }
 
 RUN_COMMAND(){