From fe08a3a14e2f64f1b28118d02dd41143448d1e1b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 6 Jul 2025 13:07:17 -0500 Subject: [PATCH] update --- inc/services.inc | 6 +++--- uninstall.sh | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/inc/services.inc b/inc/services.inc index 449a3135..3156d015 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -21,7 +21,7 @@ SINGLE_SERVER_SERVICE_CHECK(){ if [ "${1^^}" == "LPD" ] || [ "${1^^}" == "DNS" ] || [ "${1^^}" == "LDNS" ]; then dnstest=$(dig +short +tries=3 +time=3 www.google.com @127.0.0.1) if [ "${dnstest}" == "" ] || [[ "${dnstest}" == *";;"* ]]; then - /usr/local/bin/nmg skip on >/dev/null 2>&1 + SKIP_SERVER_CHECKS on >/dev/null 2>&1 completed=false; scanstart=$(date +%s) sleep 4s until [ "${completed}" == "true" ]; do @@ -43,8 +43,8 @@ Server did not start serving DNS requests within 10mins you moron...." 1 fi sleep 15s done - /usr/bin/docker start powerdns_admin >/dev/null 2>&1 - /usr/local/bin/nmg skip off >/dev/null 2>&1 + /usr/bin/docker restart powerdns_admin >/dev/null 2>&1 + SKIP_SERVER_CHECKS off >/dev/null 2>&1 fi elif [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then diff --git a/uninstall.sh b/uninstall.sh index b1a5f9eb..acde47bf 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -14,6 +14,7 @@ echo -e "${idsCL[LightGreen]}NodeMgmt Removal Script${idsCL[Default]}" do_with_root set -eu rm -f /usr/local/bin/nodemgmt +rm -f /usr/local/bin/nmg rm -Rf /opt/idssys/nodemgmt IDSSYSF="`ls -l /opt/idssys/ | grep -c ^d`"