From f14a3be2be54278ab97d7fe821e59d32dde2bb73 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 5 Aug 2024 19:47:23 -0500 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 54 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 30d70216..d9c96afc 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -25,32 +25,36 @@ fi [ -f ${NM_BACKUP_FOLDER}/templates/*.config ] && rm -f ${NM_BACKUP_FOLDER}/templates/*.config OFFSITE_STATICROUTE_FIX(){ - if [ "$(CHECK_HOST 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 [ -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" "FiX'yO ShiTTy aSS VPN" - touch ${NM_TMPFOLDER}/vpn-tunnel.down.sent - fi - fi - fi - else - rm -f ${NM_TMPFOLDER}/vpn-tunnel* + if [ -f ${NM_TMPFOLDER}/vpn-tunnel.down.sent ; then + [ "$(CHECK_HOST 10.5.0.1)" != "true" ] && exit fi + + # if [ "$(CHECK_HOST 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 [ -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 } BACKUP(){