voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-07-16 22:22:16 -05:00
parent 88fc83b837
commit c35401f557
5 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='4.10.1-07162023'
VERS='4.10.5-07162023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns '
CERT_DAEMON='/snap/bin/certbot'
@@ -113,22 +113,27 @@ fi
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=
RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
for NTYPE in "${NM_NODE_TYPES[@]}"; do
var=${NTYPE}_HOSTS[@]
RUN_NODE_TYPE=""
for nip in "${!var}"; do
# echo "$nip - ${RNIP} - ${RUN_NODE_TSIP}"
if [[ "${RNIP}" == *"${nip}"* ]]; then
RUN_NODE_TYPE=${NTYPE};
RUN_NODE_IP=${RNIP}
break 2
elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then
RUN_NODE_TYPE=${NTYPE};
RUN_NODE_IP=${RUN_NODE_TSIP}
break 2
fi
if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
RUN_NODE_TYPE=NM;
RUN_NODE_IP=${RNIP}
else
for NTYPE in "${NM_NODE_TYPES[@]}"; do
var=${NTYPE}_HOSTS[@]
RUN_NODE_TYPE=""
for nip in "${!var}"; do
# echo "$nip - ${RNIP} - ${RUN_NODE_TSIP}"
if [[ "${RNIP}" == *"${nip}"* ]]; then
RUN_NODE_TYPE=${NTYPE};
RUN_NODE_IP=${RNIP}
break 2
elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then
RUN_NODE_TYPE=${NTYPE};
RUN_NODE_IP=${RUN_NODE_TSIP}
break 2
fi
done
done
done
fi
[ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx
[ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]} || NM_CERTPATH=/etc/letsencrypt
@@ -160,7 +165,7 @@ NM_BACKUP_ITEMS['fail2ban']=/etc/fail2ban
GET-CHECKCERT-DOMAINS(){
declare -A CHECKCERT_DOMAINS
IFS=$'\n'
for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/ssl-cert-check/ssldomains`; do
for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/ssl-domain-checks.conf`; do
HOST=${LINE%% *}
PORT=${LINE#* }
IFS=" "