Update nodemgmt-scripts.sh
This commit is contained in:
@@ -79,6 +79,7 @@ NEWCERT(){
|
|||||||
do_with_root chmod -R 6775 /etc/letsencrypt
|
do_with_root chmod -R 6775 /etc/letsencrypt
|
||||||
rm -f /etc/letsencrypt/cert-request.lastrun
|
rm -f /etc/letsencrypt/cert-request.lastrun
|
||||||
echo -e "${NEW_CERT}" > /etc/letsencrypt/cert-request.lastrun
|
echo -e "${NEW_CERT}" > /etc/letsencrypt/cert-request.lastrun
|
||||||
|
DIVIDER true
|
||||||
echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
|
echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
|
||||||
checked=false
|
checked=false
|
||||||
until [ "${checked}" = "" ]; do
|
until [ "${checked}" = "" ]; do
|
||||||
@@ -121,30 +122,22 @@ CERTRENEW(){
|
|||||||
do_with_root chown -R root:letsencrypt /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
do_with_root chown -R root:letsencrypt /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
||||||
do_with_root chmod -R 6775 /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
do_with_root chmod -R 6775 /etc/letsencrypt 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
||||||
yes | cp -rfH /opt/idssys/nodemgmt/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun
|
yes | cp -rfH /opt/idssys/nodemgmt/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun
|
||||||
|
daterun=`date +%Y-%m-%d-%H-%M`
|
||||||
|
echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun
|
||||||
|
DIVIDER true
|
||||||
echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
|
echo -en "${idsCL[LightYellow]}Waiting for certifcate replication between the nodes... ${idsCL[Default]}"
|
||||||
|
checked=false
|
||||||
until [ "${synccomplete}" = "true" ]; do
|
until [ "${checked}" = "" ]; do
|
||||||
synccomplete=true
|
tchecked=''
|
||||||
for nip in "${NODE_HOSTS[@]}"
|
for nip in "${NODE_HOSTS[@]}"; do
|
||||||
do
|
|
||||||
if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
|
if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
|
||||||
else NCMD="ssh root@${nip}"
|
else NCMD="ssh root@${nip}"
|
||||||
fi
|
fi
|
||||||
if [ "${NCMD}" != "" ]; then
|
if [ "${NCMD}" != "" ]; then
|
||||||
check=`${NCMD} "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
|
tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-request.lastrun" | diff - /etc/letsencrypt/cert-request.lastrun`
|
||||||
if [ "${check}" != "" ]; then
|
|
||||||
synccomplete=false
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
checked=${tchecked}
|
||||||
|
|
||||||
#same1=`ssh root@10.5.10.52 "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
|
|
||||||
#same2=`ssh root@10.5.10.53 "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
|
|
||||||
#if [ "${same1}" = "" ] && [ "${same2}" = "" ]
|
|
||||||
# then same="true"
|
|
||||||
# else same="false"
|
|
||||||
#fi
|
|
||||||
done
|
done
|
||||||
SERVICE nginx reload 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
SERVICE nginx reload 2>&1 | tee -a /opt/idssys/nodemgmt/cert-renewal.lastrun
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user