diff --git a/defaults.inc b/defaults.inc index 96a55ced..c883b8bc 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.0b-12062023' -NM_BETA=true +VERS='5.1.1-12062023' +NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index e386e429..b44fd178 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -868,7 +868,7 @@ GUI(){ STATUS freespace ${3} else status_start=$(date +%Y-%m-%d-%H-%M-%S) - STATUSRUN_TMPFOLDER=${NM_TMPFOLDER}/${status_start} + STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${status_start}" mkdir ${STATUSRUN_TMPFOLDER} touch "${STATUSRUN_TMPFOLDER}/status-check.running" @@ -883,13 +883,12 @@ GUI(){ mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.lastrun rm -Rf ${STATUSRUN_TMPFOLDER} - # if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 3600 ]; then - # for oldstatus_check in ${NM_TMPFOLDER}/*; do - # if [ -d "${oldstatus_check}" ]; then - # echo "$f" - # fi - # done - # fi + if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 3600 ]; then + for oldstatus_check in ${NM_TMPFOLDER}/status-*; do + [ -d "${oldstatus_check}" ] && [ $(expr $(date +%s) - $(stat -c %Y ${oldstatus_check}) -ge 1200 ] && rm -Rf ${oldstatus_check} + done + touch ${NM_TMPFOLDER}/.statusclean + fi if [ "${3}" == "email" ]; then echo -e "\n\n" >> ${NM_LOGFOLDER}/status-check.lastrun @@ -943,14 +942,7 @@ GUI(){ backup-offsitepfsense) BACKUP_OFFSITEPFSENSE;; test) - if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 1 ]; then - for oldstatus_check in ${NM_TMPFOLDER}/status-*; do - if [ -d "${oldstatus_check}" ]; then - echo "(${oldstatus_check}) $(date +%s) - $(stat -c %Y ${oldstatus_check}) = $(expr $(date +%s) - $(stat -c %Y ${oldstatus_check}))" - fi - done - touch ${NM_TMPFOLDER}/.statusclean - fi + tmp=tmp ;; gui) GUI;;