voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-09-04 15:07:33 -05:00
parent 1fd1ce698b
commit 63d5042c2a
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 ' 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' CERT_DAEMON='/snap/bin/certbot'

23
nodemgmt-scripts.sh
View File

@@ -573,13 +573,27 @@ UPDATE_DYNDNS(){
BACKUP_OFFSITEPFSENSE(){ BACKUP_OFFSITEPFSENSE(){
BAKFOLDER=/mnt/BU-Raid1.new/Offsite-pfSense_Backups 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} mkdir ${newBAKFOLDER}
ssh root@10.2.1.1 tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf 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}/ scp root@10.2.1.1:/cf/conf/conf* ${newBAKFOLDER}/
ssh root@10.2.1.1 rm -f /cf/conf/conf_backup.tar.gz 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`) dailyfilestokeep=(`ls -d ${BAKFOLDER}/*-D 2> /dev/null | tail -7`)
weeklyfilestokeep=(`ls -d ${BAKFOLDER}/*-W 2> /dev/null | tail -4`) weeklyfilestokeep=(`ls -d ${BAKFOLDER}/*-W 2> /dev/null | tail -4`)
monthlyfilestokeep=(`ls -d ${BAKFOLDER}/*-M 2> /dev/null | tail -12`) monthlyfilestokeep=(`ls -d ${BAKFOLDER}/*-M 2> /dev/null | tail -12`)
@@ -599,13 +613,6 @@ BACKUP_OFFSITEPFSENSE(){
[ $keep == 0 ] && rm -rf ${i} [ $keep == 0 ] && rm -rf ${i}
done 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(){ RUN_COMMAND(){