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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-13 09:17:41 -06:00
parent 6870579ec9
commit 3ad3836cd6
4 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
inc/certs.inc
View File

@@ -196,30 +196,6 @@ LISTCERTS(){
unset IFS
fi
for ccc in ${!CHECKCERT_DOMAINS[@]}; do
echo "HERE1: ${ccc} = ${CHECKCERT_DOMAINS[${ccc}]}"
done
# declare -A oldCHECKCERT_DOMAINS
# IFS=$'\n'
# for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
# HOST=${LINE%% *}
# PORT=${LINE#* }
# IFS=" "
# oldCHECKCERT_DOMAINS+="${HOST} ${PORT}"
# done
# unset IFS
# echo
IFS=$'\n' CHECKCERT_DOMAINSnew=($(sort <<<"$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)"))
unset IFS
for ccc in ${CHECKCERT_DOMAINSnew[@]}; do
echo "HERE2: ${ccc}"
done
# if [ ! -z ${LOCAL_SERVICES+x} ]; then
# NCMD="ssh root@${NM_HOSTS['LB'][0]}"
# #${NCMD} rm -f /tmp/ssllist
@@ -418,23 +394,15 @@ LISTCERTS(){
if [ "${monitored^^}" == "YES" ]; then
if [ "$(grep ${SUBJECT} ${NM_FOLDER}/conf/ssl-domain-checks.conf)" == "" ]; then
[ ! -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ] && touch ${NM_FOLDER}/conf/ssl-domain-checks.conf
# echo "${SUBJECT} 443" >> ${NM_FOLDER}/conf/ssl-domain-checks.conf
unset CHECKCERT_DOMAINS
declare -A CHECKCERT_DOMAINS
IFS=$'\n'
for LINE in `egrep -v '(^#|^$)' ${NM_FOLDER}/conf/ssl-domain-checks.conf`; do
HOST=${LINE%% *}
PORT=${LINE#* }
IFS=" "
oldCHECKCERT_DOMAINS[${HOST}]=${PORT}
done
unset IFS
readarray -td '' CHECKCERT_DOMAINS < <(printf '%s\0' "${oldCHECKCERT_DOMAINS[@]}" | sort -z)
echo "${SUBJECT} 443" >> ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
checkcerts_sorted=$(sort <<< "$(cat ${NM_FOLDER}/conf/ssl-domain-checks.conf)")
if [ "${NM_NODEMANAGER}" != "$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1 | head -n1)" ]; then
ssh root@${NM_NODEMANAGER} rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
ssh root@${NM_NODEMANAGER} echo "${checkcerts_sorted}" > ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
fi
rm -f ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
echo "${checkcerts_sorted}" > ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
fi
else
sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf
fi