diff --git a/conf/defaults.local.example.inc b/conf/defaults.local.example.inc index 6f3cd93c..710453c5 100755 --- a/conf/defaults.local.example.inc +++ b/conf/defaults.local.example.inc @@ -2,6 +2,24 @@ #----------------------------------------------------------------------------------------------------------------------------------------- NM_NODEMANAGER=192.168.1.5 +# DEFINE VCENTER INFO TO APPLY SSL CERTS +#----------------------------------------------------------------------------------------------------------------------------------------- +# NM_VC_HOSTNAME='vCenter FQDN or LAN IP' +# NM_VC_USER='administrator@vsphere.local' +# NM_VC_PASS='supersecret' + +# DEFINE DYNMAIC DNS LOGIN INFO FOR POWER-DNS SERVERS FOR UPDATING RECORDS +#----------------------------------------------------------------------------------------------------------------------------------------- +# NM_DYNHOST="wdns.scity.us" # IF NOT DEFINED, USES SCITY DEFAULT PDNS SERVERS (wdns.scity.us) +NM_DYNUSER="" +NM_DYNPASS="" +NM_WPDNS_KEY="" + +NM_DYNDNS_LOC['mainsite']='comma seperated list of DNS A records to update' +NM_DYNDNS_LOC['offsite']='comma seperated list of DNS A records to update for other site' + + + # DEFIINE NODE TYPES OF THEIR ASSOCIATES HOSTS TO MONITOR (comma seperated) #----------------------------------------------------------------------------------------------------------------------------------------- NM_HOSTS['LB']=192.168.1.11,192.168.1.12 @@ -28,7 +46,7 @@ NM_HOSTNAMES['192.168.1.12']='LoadBalancer-Node2' #----------------------------------------------------------------------------------------------------------------------------------------- NM_SERVICES_CHECK['LB']=nginx,haproxy,keepalived NM_SERVICES_CHECK['MYSQL']=mariadb,proxysql,keepalived -NM_SERVICES_CHECK['WEB']=nginx,php5.6-fpm,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,keepalived +NM_SERVICES_CHECK['WEB']=nginx,php7.2-fpm,php7.3-fpm,php7.4-fpm,php8.2-fpm,gitea,keepalived # DEFINES DOCKERS TO MONITOR ON EACH HOST PART OF THE NODE TYPE (comma seperated) #----------------------------------------------------------------------------------------------------------------------------------------- @@ -81,7 +99,7 @@ NM_SINGLESRVR_DOCKERS['WEB']=vaultwarden,heimdall,authelia #----------------------------------------------------------------------------------------------------------------------------------------- NM_SINGLESRVR_IP['LB']= NM_SINGLESRVR_IP['MYSQL']= -NM_SINGLESRVR_IP['WEB']=10.10.1.20 +NM_SINGLESRVR_IP['WEB']=192.168.1.10 # DEFINES THE CONFIGURED SERVICE DESCRIPTIONS diff --git a/defaults.inc b/defaults.inc index 6b458813..8aef5a53 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.12-11232023' +VERS='4.15.13-11232023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 8915e2a6..225f7db2 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -408,6 +408,7 @@ ADD_LOGROTATE_CRONTAB(){ } UPDATE_DYNDNS(){ + [ "${NM_DYNHOST}" != "" ] && PDNS_SERVER=${NM_DYNHOST} || PDNS_SERVER=${NM_WANDNS} TESTMODE=0; FORCE=0; while [ $# -gt 0 ]; do case "${1}" in @@ -437,7 +438,7 @@ UPDATE_DYNDNS(){ cw_spc=10 echo -e "Checking for DYNDNS update at '${idsCL[Green]}${LOCATION^^}${idsCL[Default]}'" echo - echo -en "${idsCL[White]}Previous WAN IP : "; OLDIP=`dig +short ${DYNDNS_HOSTS[0]} @${NM_WANDNS} +time=2`; echo -e "${idsCL[Cyan]}${OLDIP}" + echo -en "${idsCL[White]}Previous WAN IP : "; OLDIP=`dig +short ${DYNDNS_HOSTS[0]} @${PDNS_SERVER} +time=2`; echo -e "${idsCL[Cyan]}${OLDIP}" echo -en "${idsCL[White]}Current WAN IP : "; NEWIP=`dig +short myip.opendns.com @resolver1.opendns.com +time=2`; echo -e "${idsCL[LightGreen]}${NEWIP}" echo @@ -452,9 +453,9 @@ UPDATE_DYNDNS(){ echo -en "${idsCL[Green]}'${idsCL[LightCyan]}${LOCATION^^}${idsCL[Green]}' WAN IP has changed, updating all pre-defined 'A' records ... " fi if [ "${NM_DYNUSER}" != "" ] && [ "${NM_DYNPASS}" != "" ]; then - if [ "$(curl -m 3 -sL "https://${NM_DYNUSER}df:${NM_DYNPASS}@${NM_WANDNS}/domain/${domain}" | grep "HTTP 403 Error")" == "" ]; then + if [ "$(curl -m 3 -sL "https://${NM_DYNUSER}df:${NM_DYNPASS}@${PDNS_SERVER}/domain/${domain}" | grep "HTTP 403 Error")" == "" ]; then for host in ${DYNDNS_HOSTS[@]}; do - /usr/bin/curl -s "https://${NM_DYNUSER}:${NM_DYNPASS}@${NM_WANDNS}/nic/update?hostname=${host}&myip=${NEWIP}" > /dev/null 2>&1 + /usr/bin/curl -s "https://${NM_DYNUSER}:${NM_DYNPASS}@${PDNS_SERVER}/nic/update?hostname=${host}&myip=${NEWIP}" > /dev/null 2>&1 done [ "${LOCATION,,}" == "mainsite" ] && /usr/bin/curl -s "https://${NM_DYNUSER}:${NM_DYNPASS}@${NM_LANDNS}/nic/update?hostname=sc1.scity.us&myip=${NEWIP}" > /dev/null 2>&1 [ "${LOCATION,,}" == "offsite" ] && /usr/bin/curl -s "https://${NM_DYNUSER}:${NM_DYNPASS}@${NM_LANDNS}/nic/update?hostname=wan.offsite.scity.us&myip=${NEWIP}" > /dev/null 2>&1 @@ -484,7 +485,7 @@ UPDATE_DYNDNS(){ fi if [ ${TESTMODE} -eq 1 ]; then echo -en "\nDYNDNS Credential Test: " - if [ "$(curl -m 3 -sL "https://${NM_DYNUSER}df:${NM_DYNPASS}@${NM_WANDNS}/domain/${domain}" | grep "HTTP 403 Error")" == "" ]; then + if [ "$(curl -m 3 -sL "https://${NM_DYNUSER}df:${NM_DYNPASS}@${PDNS_SERVER}/domain/${domain}" | grep "HTTP 403 Error")" == "" ]; then echo -e "${idsCL[Green]}Pass${idsCL[Default]}" else echo -e "${idsCL[LightRed]}Fail${idsCL[Default]}"