diff --git a/defaults.inc b/defaults.inc index 0e7be1e1..e698e770 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.12.70-10302023' +VERS='4.12.71-11012023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/services.inc b/inc/services.inc index 52940ff5..d53b3574 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -241,7 +241,7 @@ SERVICE(){ ${PH_CMD} rm -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl fi fi - elif ([ "${1}" = "pdns2" ] || [ "${1}" = "pdnsadmin2" ] || [ "${1}" = "headscale" ]) && ([ "${3}" == "" ] || [ "${3}" == "all" ]); then + elif ([ "${1}" = "pdns" ] || [ "${1}" = "pdnsadmin" ] || [ "${1}" = "headscale" ]) && ([ "${3}" == "" ] || [ "${3}" == "all" ]); then if [ "${2}" = "start" ] || [ "${2}" = "restart" ] || [ "${2}" = "reload" ]; then if [ "${3}" != "ns" ]; then if [ "${3}" != "q" ]; then diff --git a/inc/status.inc b/inc/status.inc index c23ebdab..38fdc612 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -203,6 +203,7 @@ STATUS(){ touch ${NM_TMPFOLDER}/${nip}~${srvc}.down # SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_SERVICE_DESC[${srvc}]} is down" 1 echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE} + [ "${srvc}" == "pdnsadmin" ] && ${NCMD} systemctl restart ${srvc} & else errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down) if [ $errtime -gt ${RENOTIFY_TIMEOUT} ]; then