From 3df6f48ac891f901302cc6b3acb4f0f5a16a665e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 24 Jun 2023 18:38:15 -0500 Subject: [PATCH] update --- defaults.inc | 4 +-- nodemgmt-scripts.sh | 67 ++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/defaults.inc b/defaults.inc index 028d0b84..29773f76 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.7.142-06232023' +VERS='4.7.143-06232023' # NODETYPES=WEB NODETYPES=LB,LPD,MM,MYSQL,NC,PW,WPD,WM,WEB @@ -337,7 +337,7 @@ SENDNOTICE(){ $(date)" "${1}" ${3} & - [ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date)" | mail -s "${1}" ${EMAIL_NOTICE} + [ "${EMAIL_NOTICE}" != "" ] && echo -e "${1}\n\n$(date)" | mail -s "${2}" ${EMAIL_NOTICE} } diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index f95b312b..bd44eb35 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -989,57 +989,42 @@ ADD_LOGROTATE_CRONTAB(){ } UPDATE_DYNDNS(){ - if [ "${1}" != 'q' ]; then + if [ "${2}" != 'q' ]; then echo -e "${idsCL[LightCyan]}Updating Primary DNS A records with any WAN IP changes... ${idsCL[Default]}" fi - OLDIP=`dig +short sc1.scity.us @ns1.scity.us` + if [ "${1}" == "home" ]; then + OLDIP=`dig +short sc1.scity.us @ns1.scity.us` + elif [ "${1}" == "offsite" ]; then + OLDIP=`dig +short offsite.scity.us @ns1.scity.us` + fi NEWIP=`dig +short myip.opendns.com @resolver1.opendns.com` if [ "${OLDIP}" != "${NEWIP}" ] && [ "${NEWIP}" != ";; connection timed out; no servers could be reached" ]; then - # dnss=0 - # for i in {1..3}; do - # curl -m 15 -s --head --request GET https://wdns${i}.scity.us | grep "HTTP/2 302" > /dev/null && dnss=$i && break - # done - # - # if [ "${dnss}" != "0" ]; then - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=sc1.scity.us&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=sc2.scity.us&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=scity.us&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=schroedercity.com&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=dasrei.com&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=snsinvest.com&myip=${NEWIP}" > /dev/null 2>&1 - # /usr/bin/curl -s "https://systems:Dcs9613@wdns${dnss}.scity.us/nic/update?hostname=misfitsmc.com&myip=${NEWIP}" > /dev/null 2>&1 - # - # SENDNOTICE "Updated WAN IP from '${OLDIP}' to '${NEWIP}'" "DYNDNS Updated" - # - # if [ "${1}" != 'q' ]; then - # echo -e "${idsCL[Green]}Updated WAN IP from '${OLDIP}' to '${NEWIP}'${idsCL[Default]}" - # fi - # else - # SENDNOTICE "Could not connect to any WDNS-PDNS server to update WAN IP" "DYNDNS ERROR" - # fi + if [ "${1}" == "home" ]; then + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=sc1.scity.us&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=sc2.scity.us&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=scity.us&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=schroedercity.com&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=dasrei.com&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=snsinvest.com&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=misfitsmc.com&myip=${NEWIP}" > /dev/null 2>&1 + + elif [ "${1}" == "offsite" ]; then + /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=offsite.scity.us&myip=${NEWIP}" > /dev/null 2>&1 + + fi + SENDNOTICE "Updated ${1^} WAN IP from '${OLDIP}' to '${NEWIP}'" "${1^^} DYNDNS Updated" + [ "${2}" != 'q' ] && echo -e "${idsCL[Green]}Updated ${1^} WAN IP from '${OLDIP}' to '${NEWIP}'${idsCL[Default]}" - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=sc1.scity.us&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=sc2.scity.us&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=scity.us&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=schroedercity.com&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=dasrei.com&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=snsinvest.com&myip=${NEWIP}" > /dev/null 2>&1 - /usr/bin/curl -s "https://systems:Dcs9613@wdns.scity.us/nic/update?hostname=misfitsmc.com&myip=${NEWIP}" > /dev/null 2>&1 - - SENDNOTICE "Updated WAN IP from '${OLDIP}' to '${NEWIP}'" "DYNDNS Updated" - - if [ "${1}" != 'q' ]; then - echo -e "${idsCL[Green]}Updated WAN IP from '${OLDIP}' to '${NEWIP}'${idsCL[Default]}" - fi + elif [ "${NEWIP}" == ";; connection timed out; no servers could be reached" ]; then + [ "${2}" != 'q' ] && echo -e "${idsCL[Red]}Could reach any servers${idsCL[Default]}" + SENDNOTICE "Connection error, could reach any servers" "${1^^} DYNDNS Could not Update" else - if [ "${1}" != 'q' ]; then - echo -e "${idsCL[Green]}WAP IP has not changed '${OLDIP}' = '${NEWIP}'${idsCL[Default]}" - fi + [ "${2}" != 'q' ] && echo -e "${idsCL[Green]}${1^^} WAN IP has not changed '${OLDIP}' = '${NEWIP}'${idsCL[Default]}" fi - if [ "${1}" != 'q' ]; then + if [ "${2}" != 'q' ]; then echo "" read -n 1 -s -p "Press any key to continue" echo