diff --git a/defaults.inc b/defaults.inc index 808bd806..fdcb400f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.26-11232023' +VERS='4.15.27-11252023' 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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/status.inc b/inc/status.inc index 53e1c585..aeb690f7 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -163,14 +163,16 @@ STATUS(){ fi if [ "${NCMD}" != "" ]; then checkhost=$(CHECK_HOST ${nip}) + [ "${checkhost}" != "false" ] && checkhostssl=$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} echo ok 2>&1) || checkhostssl='' + else + checkhost=true + checkhostssl=ok fi - if [ "${checkhost}" != "false" ]; then + if [ "${checkhost}" != "false" ] && [ "${checkhostssl}" == "ok" ]; then if [ "${ST_ACTION}" != "check" ]; then #echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}" if ([ "${ST_ACTION}" == "report" ] && [ "${2}" == "email" ]) || [ "${ST_ACTION}" != "report" ]; then - if [ "${NTYPE}" != "OFW" ]; then - uptime=$(${NCMD} uptime -p) - else + if [ "${NTYPE}" == "OFW" ]; then uptime=$(${NCMD} uptime | awk '{print $3}' | cut -d, -f1) if [ ${#uptime} -ge 6 ]; then uptime="up $(echo $uptime | cut -d: -f1) days, $(echo $uptime | cut -d: -f2) hours, $(echo $uptime | cut -d: -f3) minutes" @@ -179,6 +181,10 @@ STATUS(){ else uptime="up ${uptime} minutes" fi + + else + uptime=$(${NCMD} uptime -p) + fi echo -e "${idsCL[LightCyan]} - ${uptime} ${idsCL[LightYello]}${LH}${idsCL[Default]}" else @@ -440,25 +446,39 @@ STATUS(){ fi if [ "${ST_ACTION}" != "check" ]; then toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime) - echo -e "${idsCL[Red]} - Node is down!${idsCL[Default]}" + if [ "${checkhostssl}" != "" ]; then + echo -e "${idsCL[Red]} - Node is online, but SSL is down!${idsCL[Default]}" + + else + echo -e "${idsCL[Red]} - Node is down!${idsCL[Default]}" + fi fi # SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1 - echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - Node is down" >> ${NM_LOGFILE} + [ "${checkhostssl}" != "ok" ] && echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - Node is down" >> ${NM_LOGFILE} else toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}.errtime) errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}.down) if [ "${ST_ACTION}" != "check" ]; then - echo -e "${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}" + if [ "${checkhostssl}" != "" ]; then + echo -e "${idsCL[Red]} - Node SSL has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}" + else + echo -e "${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}" + fi fi if [ $errtime -gt ${NM_RENOTIFY_TIMEOUT} ]; then - SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" 1 + if [ "${checkhostssl}" != "" ]; then + SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] SSL has been down for $(SHOW_TIME ${toterrtime})" 1 + else + SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" 1 + fi elif [ $errtime -gt 60 ] && [ $errtime -lt 180 ] && [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then - SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1 + if [ "${checkhostssl}" != "" ]; then + SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is online, but SSL is down" 1 + else + SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1 + fi fi touch ${NM_TMPFOLDER}/${nip}.down - # if [ $errtime -gt ${NM_RENOTIFY_TIMEOUT} ] && [ "${EMAIL_NOTICE}" != "" ]; then - # echo "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_HOSTNAMES[${nip}]}[${nip}]" ${EMAIL_NOTICE} - # fi fi fi