From 157fa9f48ea003b78a6401469e0ef68ec3d7f59c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 25 Apr 2023 16:28:53 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- nodemgmt-scripts.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 2fc24709..26a5b640 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='4.3.19-04252023' +VERS='4.3.20-04252023' NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,PW #NODETYPES=WPD,LPD,PW. diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index bd990229..7e7119a7 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -737,14 +737,12 @@ NEWCERT(){ $CERT_DAEMON certonly --webroot -w /opt/lb-data/letsencrypt-acme-challenge -d ${NEW_CERT} # $CERT_DAEMON certonly --dry-run --webroot -w /var/www/html -d ${NEW_CERT} - sleep 1s - [ -d "/opt/lb-data/letsencrypt/live/${MAIN_CERT}" ] && echo "CERT FOUND" || echo "CERT NOT FOUND" if [ -d /opt/lb-data/letsencrypt/live/${MAIN_CERT} ]; then chown -R root:le /opt/lb-data/letsencrypt/live/${MAIN_CERT} chmod -R 6775 /opt/lb-data/letsencrypt/live/${MAIN_CERT} touch /opt/lb-data/letsencrypt/live/${MAIN_CERT}/newcert - if [ -f /opt/lb-data/letsencrypt/${MAIN_CERT}.conf ]; then + if [ -f /opt/lb-data/nginx/sites-enabled/${MAIN_CERT}.conf ]; then rm -f ${FOLDER}/cert-request.lastrun daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${NEW_CERT}\n${daterun}" > ${FOLDER}/cert-request.lastrun