Update defaults.inc

This commit is contained in:
2025-04-20 13:02:37 -05:00
parent 49c95278c4
commit e6eaa61451

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.4.5-04202025' VERS='5.4.5c-04202025'
NM_BETA=false NM_BETA=false
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 betacheck offsite-staticroute-fix ' 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 betacheck offsite-staticroute-fix '
@@ -131,20 +131,22 @@ if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
RUN_NODE_IP=${RNIP} RUN_NODE_IP=${RNIP}
else else
for NTYPE in "${NM_NODE_TYPES[@]}"; do for NTYPE in "${NM_NODE_TYPES[@]}"; do
var=${NTYPE}_HOSTS[@] if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && [[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]]); then
RUN_NODE_TYPE="" var=${NTYPE}_HOSTS[@]
for nip in "${!var}"; do RUN_NODE_TYPE=""
# echo "${NTYPE} - $nip - ${RNIP} - ${RUN_NODE_TSIP}" for nip in "${!var}"; do
if [[ "${RNIP}" == *"${nip}"* ]]; then # echo "${NTYPE} - $nip - ${RNIP} - ${RUN_NODE_TSIP}"
RUN_NODE_TYPE=${NTYPE}; if [[ "${RNIP}" == *"${nip}"* ]]; then
RUN_NODE_IP=${RNIP} RUN_NODE_TYPE=${NTYPE};
break 2 RUN_NODE_IP=${RNIP}
elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then break 2
RUN_NODE_TYPE=${NTYPE}; elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then
RUN_NODE_IP=${RNIP} RUN_NODE_TYPE=${NTYPE};
break 2 RUN_NODE_IP=${RNIP}
fi break 2
done fi
done
fi
done done
fi fi
# echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)" # echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)"