From c10390fbd1eab12853ee5872e845cc5d50a1707d Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 8 Dec 2015 10:06:17 +0100 Subject: [PATCH] simplify expiry check --- letsencrypt.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/letsencrypt.sh b/letsencrypt.sh index 303a499..1631914 100755 --- a/letsencrypt.sh +++ b/letsencrypt.sh @@ -327,12 +327,10 @@ fi if [[ -e "${cert}" ]]; then echo " + Found existing cert..." - # Turning off exit on non-zero status for cert validation - set +e; openssl x509 -checkend $((RENEW_DAYS * 86400)) -noout -in "${cert}"; expiring=$?; set -e valid="$(openssl x509 -enddate -noout -in "${cert}" | cut -d= -f2- )" echo -n " + Valid till ${valid} " - if [[ ${expiring} -eq 0 ]]; then + if openssl x509 -checkend $((RENEW_DAYS * 86400)) -noout -in "${cert}"; then echo "(Longer than ${RENEW_DAYS} days). Skipping!" continue fi -- 2.39.5