change openssl to use enddate for expiry date check

diff --git a/letsencrypt.sh b/letsencrypt.sh
index 09710329f688747480385eb6d837144b6aa24f39..cec6ebc9ab7c34c6839c82cf8039766dd38cbb00 100755 (executable)
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -221,8 +221,8 @@ fi
     echo -n "Found existing cert for ${domain}. Expire date ..."
     set +e; openssl x509 -checkend $((${RENEW_DAYS} * 86400)) -noout -in "certs/${domain}/cert.pem"; expiring=$?; set -e
     if [[ ${expiring} -eq 0 ]]; then
-       valid=$(openssl x509 -text -noout -in "certs/${domain}/cert.pem" | grep -i "not after"  | cut -d: -f2- )
-       echo "${valid} Skipping. (Valid longer than ${RENEW_DAYS} days.)"
+       valid=$(openssl x509 -enddate -noout -in "certs/${domain}/cert.pem" | cut -d= -f2- )
+       echo " ${valid} Skipping. (Valid longer than ${RENEW_DAYS} days.)"
         continue
     fi
     echo " is within ${RENEW_DAYS} days. Renewing..."