This commit is contained in:
2023-11-23 20:28:11 -06:00
parent 80e136c657
commit c823593c62
4 changed files with 34 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
VERS='4.15.13-11232023'
VERS='4.15.14-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'
@@ -26,7 +26,7 @@ if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
declare -A NM_SINGLESRVR_IP
declare -A NM_CERTPATHS
declare -A NM_WWWPATHS
declare -A NM_DYNDNS_LOC
declare -A NM_DYNDNS_SITES
source ${NM_FOLDER}/conf/defaults.local.inc
@@ -111,8 +111,8 @@ NM_LOGFILE=${NM_LOGFOLDER}/logfile
[ "${NM_RENOTIFY_TIMEOUT}" == "" ] && NM_RENOTIFY_TIMEOUT=3600
NM_WANDNS='wdns.scity.us'
NM_LANDNS='ldns.scity.us'
NM_PDNS_WANDNS='wdns.scity.us'
NM_PDNS_LANDNS='ldns.scity.us'
TSI=$(/sbin/ip link | grep tailscale0) && [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP=
[ "$(ip route | awk '/default/ { print $5 }')" == "link" ] && RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) ||