Cleaner outputs

config.sh.example

@@ -9,7 +9,7 @@
 # on the webserver
 #HOOK_CHALLENGE=
 
-# try to renew certs that are within RENEW_DAYS days of there expire date
+# try to renew certs that are within RENEW_DAYS days of their expiration date
 #RENEW_DAYS="14"
 
 # create new private key for each csr (yes|no)

letsencrypt.sh

@@ -101,7 +101,7 @@ signed_request() {
 sign_domain() {
   domain="${1}"
   altnames="${*}"
-  echo "Signing domain ${1} (${*})..."
+  echo " + Signing domains..."
 
   # If there is no existing certificate directory => make it
   if [[ ! -e "certs/${domain}" ]]; then
@@ -217,15 +217,22 @@ fi
 # Generate certificates for all domains found in domain.txt. Check if existing certificate are about to expire
 <domains.txt sed 's/^\s*//g;s/\s*$//g' | grep -v '^#' | grep -v '^$' | while read -r line; do
   domain="$(echo $line | cut -d' ' -f1)"
-  if [[ -e "certs/${domain}/cert.pem" ]]; then
-    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
+  cert="certs/${domain}/cert.pem"
+
+  echo "Processing ${domain}"
+  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 "certs/${domain}/cert.pem" | cut -d= -f2- )"
+
+    echo -n " + Valid till ${valid} "
     if [[ ${expiring} -eq 0 ]]; then
-	valid=$(openssl x509 -enddate -noout -in "certs/${domain}/cert.pem" | cut -d= -f2- )
-	echo " ${valid} Skipping. (Valid longer than ${RENEW_DAYS} days.)"
+      echo "(Longer than ${RENEW_DAYS} days). Skipping!"
       continue
     fi
-    echo " is within ${RENEW_DAYS} days. Renewing..."
+    echo "(Less than ${RENEW_DAYS} days). Renewing!"
   fi
 
   sign_domain $line