diff --git a/defaults.inc b/defaults.inc index ec2c5001..c9a3f17c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -210,11 +210,10 @@ DISP_HEADER(){ echo } -CHECK_HOST_NM(){ +CHECK_HOST_QC(){ if [ ! -z ${1+x} ]; then ping -c 1 ${1} > /dev/null 2>&1 [ $? -ne 0 ] && echo false || echo true - # [ "$(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 504a88f4..7b1a8f81 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -25,38 +25,39 @@ fi [ -f ${NM_BACKUP_FOLDER}/templates/*.config ] && rm -f ${NM_BACKUP_FOLDER}/templates/*.config OFFSITE_STATICROUTE_FIX(){ - if [ -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ]; then - [ "$(CHECK_HOST_NM 10.5.0.1)" != "true" ] && exit - fi + # [ -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ] && [ "$(CHECK_HOST_QC 10.5.0.1)" != "true" ] && exit + CHECK_HOST_QC 10.10.0.1 + CHECK_HOST_QC ${NM_OFFSITE_GW_IP} + CHECK_HOST_QC 10.5.0.1 - - if [ "$(CHECK_HOST_NM 10.10.0.1)" != "true" ]; then - if [ "$(CHECK_HOST_NM ${NM_OFFSITE_GW_IP})" != "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 - if [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_OFFSITE_GW_IP} ip r | grep 10.10.0.0)" = "" ]; then - RUN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_OFFSITE_GW_IP} ip r add 10.10.0.0/16 dev ${NM_OFFSITE_VPN_ADAPTER} 2>&1 >/dev/null) - if [ "${RUN}" == "" ]; then - SENDNOTICE "Static Route to Homesite Missing" "Re-added the static route onto the Offsite UniFi Gateway" - else - SENDNOTICE "ERROR: Static Route to Homesite Missing" "Cannot add the static route onto the Offsite UniFi Gateway" 1 - fi - fi - else - if [ ! -f ${NM_TMPFOLDER}/vpn-tunnel.down ]; then - touch ${NM_TMPFOLDER}/vpn-tunnel.down - elif [ $(expr `date +%s` - $(stat -c %Y ${NM_TMPFOLDER}/vpn-tunnel.down)) -ge 60 ] && [ ! -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ]; then - SENDNOTICE "VPN to Homesite Down" "VPN is down, fix your shit first, then I'll fix mine..." - touch ${NM_TMPFOLDER}/vpn-tunnel.down.sent - fi - fi - fi - else - rm -f ${NM_TMPFOLDER}/vpn-tunnel* - fi + # if [ "$(CHECK_HOST_QC 10.10.0.1)" != "true" ]; then + # if [ "$(CHECK_HOST_QC ${NM_OFFSITE_GW_IP})" != "false" ]; then + # if [ "$(CHECK_HOST_QC 10.5.0.1)" != "false" ]; then + # + # if [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_OFFSITE_GW_IP} ip r | grep 10.10.0.0)" = "" ]; then + # RUN=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_OFFSITE_GW_IP} ip r add 10.10.0.0/16 dev ${NM_OFFSITE_VPN_ADAPTER} 2>&1 >/dev/null) + # if [ "${RUN}" == "" ]; then + # SENDNOTICE "Static Route to Homesite Missing" "Re-added the static route onto the Offsite UniFi Gateway" + # else + # SENDNOTICE "ERROR: Static Route to Homesite Missing" "Cannot add the static route onto the Offsite UniFi Gateway" 1 + # fi + # fi + # else + # if [ ! -f ${NM_TMPFOLDER}/vpn-tunnel.down ]; then + # touch ${NM_TMPFOLDER}/vpn-tunnel.down + # elif [ $(expr `date +%s` - $(stat -c %Y ${NM_TMPFOLDER}/vpn-tunnel.down)) -ge 60 ] && [ ! -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ]; then + # SENDNOTICE "VPN to Homesite Down" "VPN is down, fix your shit first, then I'll fix mine..." + # touch ${NM_TMPFOLDER}/vpn-tunnel.down.sent + # fi + # fi + # fi + # else + # if [ -f ${NM_TMPFOLDER}/vpn-tunnel.down ]; then + # SENDNOTICE "VPN to Homesite is Back Up" "VPN Tunnel is up" + # rm -f ${NM_TMPFOLDER}/vpn-tunnel.down* + # fi + # fi } BACKUP(){