From d108c72a74bbff782d2b5dfb2882b8fab9a3c9a6 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 5 Mar 2024 16:44:47 -0600
Subject: [PATCH] update

---
 defaults.inc   | 2 +-
 inc/status.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 89245024..fd65bced 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='5.1.92-02282024'
+VERS='5.1.94-03052024'
 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 '
diff --git a/inc/status.inc b/inc/status.inc
index a3a5d7fe..f419bb40 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -612,7 +612,7 @@ STATUS_NODE(){
 									touch ${NM_TMPFOLDER}/${nip}~${srvc}.down
 									# SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1
 									echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE}
-									[ "${srvc}" == "pdnsadmin" ] && ${NCMD} systemctl restart ${srvc} &
+									[ "${srvc}" == "pdns" ] && ${NCMD} systemctl restart ${srvc} &
 									
 								else
 									[ -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime)) || toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down))
@@ -696,7 +696,7 @@ STATUS_NODE(){
 										echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is down, will try and fix in 1min" >> ${NM_LOGFILE}
 										echo -en "${idsCL[Red]}Not Running - will try and fix in 1min!"
 										
-									elif [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) -gt 50 ]; then
+									elif ([ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)) -gt 50 ]) || ([ -f ${NM_TMPFOLDER}/${nip}~${docker}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.fix)) -ge 3600 ]); then
 										[ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime
 										if [ "$(${NCMD} docker ps -a | grep ${docker})" ]; then
 											${NCMD} docker start ${docker} >/dev/null 2>&1