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

update

Browse Source
This commit is contained in:
David Schroeder
2025-08-19 22:22:42 -05:00
parent a74caab99b
commit 12853a181d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.6.20-08192025' VERS='5.6.21-08192025'
NM_BETA=false NM_BETA=false
@@ -138,9 +138,12 @@ NM_PDNS_LANDNS='ldns.scity.us'
if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then
RUN_NODE_TYPE=NM; IS_NODEMANAGER=1
RUN_NODE_IP=${RNIP} # RUN_NODE_TYPE=NM;
# RUN_NODE_IP=${RNIP}
else else
IS_NODEMANAGER=0
fi
for NTYPE in "${NM_NODE_TYPES[@]}"; do for NTYPE in "${NM_NODE_TYPES[@]}"; do
# if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then # if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then
var=${NTYPE}_HOSTS[@] var=${NTYPE}_HOSTS[@]
@@ -159,7 +162,7 @@ else
done done
# fi # fi
done done
fi # fi
# echo "HERE1: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)" # echo "HERE1: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP RUN_NODE_TSIP=$RUN_NODE_TSIP (RNIP=$RNIP TSI=$TSI)"

4
inc/certs.inc
View File

@@ -432,12 +432,12 @@ LISTCERTS(){
checkcerts_sorted=$(sort <<< "$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)") checkcerts_sorted=$(sort <<< "$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)")
rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1 rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
echo "${checkcerts_sorted}" > ${NM_FOLDER}/conf/ssl-domain-checks.conf echo "${checkcerts_sorted}" > ${NM_FOLDER}/conf/ssl-domain-checks.conf
[ "${RUN_NODE_TYPE}" != "NM" ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf [ ${IS_NODEMANAGER} -eq 0 ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf
fi fi
else else
sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1 sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
[ "${RUN_NODE_TYPE}" != "NM" ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf [ ${IS_NODEMANAGER} -eq 0 ] && scp -q ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${NM_NODEMANAGER}:${NM_FOLDER}/conf/ssl-domain-checks.conf
fi fi
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
echo echo