diff --git a/defaults.inc b/defaults.inc index c33ec5d2..ffce593e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -212,14 +212,7 @@ DISP_HEADER(){ CHECK_HOST_NM(){ if [ ! -z ${1+x} ]; then - # ping -c 3 ${1} > /dev/null 2>&1 - # [ $? -ne 0 ] && echo false || echo true - - if [ "$(nmap ${1} -p 22,80,443 -n | grep 'open ')" != "" ] || [ "$(nmap -sU ${1} -p 161 -n | grep 'open ')" != "" ]; then - echo true - else - echo false - fi + [ "$(nmap ${1} -p 22,80,443 -n | grep 'open ')" != "" ] || [ "$(nmap -sU ${1} -p 161 -n | grep 'open ')" != "" ] && echo true || echo false else echo false fi diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index da39c3af..fda5c379 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -26,14 +26,14 @@ fi OFFSITE_STATICROUTE_FIX(){ if [ -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ]; then - [ "$(CHECK_HOST 10.5.0.1)" != "true" ] && exit + [ "$(CHECK_HOST_NM 10.5.0.1)" != "true" ] && exit fi - if [ "$(CHECK_HOST 10.10.0.1)" != "true" ]; then + if [ "$(CHECK_HOST_NM 10.10.0.1)" != "true" ]; then if [ "$(CHECK_HOST ${NM_OFFSITE_GW_IP})" != "false" ]; then - if [ "$(CHECK_HOST 10.5.0.1)" != "false" ]; then + if [ "$(CHECK_HOST_NM 10.5.0.1)" != "false" ]; then if [ -f ${NM_TMPFOLDER}/vpn-tunnel.down ]; then SENDNOTICE "VPN to Homesite is Back Up" "VPN Tunnel is up" fi