diff --git a/defaults.inc b/defaults.inc index e9fdf98e..407fc244 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.6.20-08192025' +VERS='5.6.21-08192025' NM_BETA=false @@ -138,9 +138,12 @@ NM_PDNS_LANDNS='ldns.scity.us' if [ "${RNIP}" == "${NM_NODEMANAGER}" ]; then - RUN_NODE_TYPE=NM; - RUN_NODE_IP=${RNIP} + IS_NODEMANAGER=1 +# RUN_NODE_TYPE=NM; +# RUN_NODE_IP=${RNIP} else + IS_NODEMANAGER=0 +fi for NTYPE in "${NM_NODE_TYPES[@]}"; do # if [ "${1}" != "service" ] || ([ "${1}" == "service" ] && ([[ "${NM_SERVICES_CHECK[${NTYPE}]}" = *"${2}"* ]] || [ "${NTYPE}" == "${2^^}" ])); then var=${NTYPE}_HOSTS[@] @@ -159,7 +162,7 @@ else done # fi 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)" diff --git a/inc/certs.inc b/inc/certs.inc index abc8e8b4..058a1e08 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -432,12 +432,12 @@ LISTCERTS(){ checkcerts_sorted=$(sort <<< "$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)") rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1 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 else 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 echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo