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

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-06 11:28:08 -06:00
parent d213ba54dd
commit 03c65a3986
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.0b-12062023' VERS='5.1.1-12062023'
NM_BETA=true 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 ' 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' CERT_DAEMON='/snap/bin/certbot'

24
nodemgmt-scripts.sh
View File

@@ -868,7 +868,7 @@ GUI(){
STATUS freespace ${3} STATUS freespace ${3}
else else
status_start=$(date +%Y-%m-%d-%H-%M-%S) 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} mkdir ${STATUSRUN_TMPFOLDER}
touch "${STATUSRUN_TMPFOLDER}/status-check.running" touch "${STATUSRUN_TMPFOLDER}/status-check.running"
@@ -883,13 +883,12 @@ GUI(){
mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.lastrun mv ${STATUSRUN_TMPFOLDER}/status-check.running ${NM_LOGFOLDER}/status-check.lastrun
rm -Rf ${STATUSRUN_TMPFOLDER} rm -Rf ${STATUSRUN_TMPFOLDER}
# if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 3600 ]; then if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 3600 ]; then
# for oldstatus_check in ${NM_TMPFOLDER}/*; do for oldstatus_check in ${NM_TMPFOLDER}/status-*; do
# if [ -d "${oldstatus_check}" ]; then [ -d "${oldstatus_check}" ] && [ $(expr $(date +%s) - $(stat -c %Y ${oldstatus_check}) -ge 1200 ] && rm -Rf ${oldstatus_check}
# echo "$f" done
# fi touch ${NM_TMPFOLDER}/.statusclean
# done fi
# fi
if [ "${3}" == "email" ]; then if [ "${3}" == "email" ]; then
echo -e "\n\n" >> ${NM_LOGFOLDER}/status-check.lastrun echo -e "\n\n" >> ${NM_LOGFOLDER}/status-check.lastrun
@@ -943,14 +942,7 @@ GUI(){
backup-offsitepfsense) BACKUP_OFFSITEPFSENSE;; backup-offsitepfsense) BACKUP_OFFSITEPFSENSE;;
test) test)
if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 1 ]; then tmp=tmp
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
;; ;;
gui) GUI;; gui) GUI;;