diff --git a/defaults.inc b/defaults.inc index 7dd1d408..3a54f59a 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.5.10-06012025' +VERS='5.5.12-06012025' 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 offsite-staticroute-fix ' diff --git a/inc/status.inc b/inc/status.inc index 7a78ab3a..4167686b 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -629,7 +629,7 @@ STATUS_NODE(){ fi tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]} SSCHK=true - if ${SSHCMD} root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then + if [ "$(GETSKIP ${nip} host)" == "true" ]; then SSCHK=skip elif [[ ${tmp[@]} =~ ${srvc} ]]; then if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then @@ -688,7 +688,7 @@ STATUS_NODE(){ ######################################### ############ SERVICE REPAIRS ############ - if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 120 ] && [ "$(GETSKIP ${nip} host)" == "false" ]; then + if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 90 ]; then if [ "${srvc}" == "pihole-FTL" ]; then ${SSHCMD} root@${nip} 'pihole -r' & >/dev/null 2>&1 touch ${NM_TMPFOLDER}/${nip}~${srvc}.fix diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 1c48a0c1..18528456 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1433,7 +1433,7 @@ GUI(){ echo -e "}\n" exit 0 else - if [ ${#STATUSRUNS[@]} -lt 3 ] && [ ! -f ${NM_TMPFOLDER}/.skip ]; then + if [ ${#STATUSRUNS[@]} -lt 3 ] && ([ ! -f ${NM_TMPFOLDER}/.skip ] || ([ -f ${NM_TMPFOLDER}/.skip ] && [ "${2}" != "report" ])); then STATUS_START=$(date +%Y-%m-%d-%H-%M-%S) STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${STATUS_START}" mkdir ${STATUSRUN_TMPFOLDER}