diff --git a/defaults.inc b/defaults.inc index bed6f13c..cb65b526 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.10.67-08122023' +VERS='4.10.68-08242023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index b8a0a370..62607aa9 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -571,6 +571,31 @@ UPDATE_DYNDNS(){ fi } +BACKUP_OFFSITEPFSENSE(){ + BAKFOLDER=/mnt/BU-Raid1/Offsite-pfSense_Backups/`date +%Y%m%d-%H%M` + mkdir ${BAKFOLDER} + + 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* ${BAKFOLDER}/ + ssh root@10.2.1.1 rm -f /cf/conf/conf_backup.tar.gz + #scp root@10.2.1.1:/cf/conf/config.xml ${BAKFOLDER}/config.xml + + [ "${BackupsToKeep}" == "" ] && BackupsToKeep=2 + files=(`ls -1 ${BAKFOLDER}/* | tail -${BackupsToKeep}`) + for i in $(ls -1 ${BAKFOLDER}/*); do keep=0; + for a in ${files[@]}; do + if [ $i == $a ]; then keep=1; fi; + done; + if [ $keep == 0 ]; then + echo "$(date) - REMOVING : $i" + #[ $TEST != true ] && rm -rf $i + else + echo "$(date) - KEEPING : $i" + fi + done + +} + RUN_COMMAND(){ echo "${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}" for NTYPE in "${NM_NODE_TYPES[@]}"; do @@ -883,6 +908,8 @@ GUI(){ vc-ssl) VCENTER-SSL ${2};; run) RUN_COMMAND ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15};; update-pushover) UPDATEPUSHOVERINFO;; + backup-offsitepfsense) BACKUP_OFFSITEPFSENSE;; + gui) GUI;; *) echo -e "Commands followed by '-h' will show addtional info. {work-in-progress}"