From cfa66e138748721ceb002488abe9ec5dfe999150 Mon Sep 17 00:00:00 2001 From: f Date: Fri, 14 Jun 2024 16:46:14 -0300 Subject: [PATCH] feat: tap format --- certbotd.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/certbotd.sh b/certbotd.sh index c7de934..e9670ac 100755 --- a/certbotd.sh +++ b/certbotd.sh @@ -1,7 +1,7 @@ #!/bin/sh if test -z "${NODES}" && test -z "${SINGLE_NODE}"; then - echo "The env var NODES is empty, if you don't want to synchronize to other servers, set SINGLE_NODE=true" >&2 + echo "not ok - The env var NODES is empty, if you don't want to synchronize to other servers, set SINGLE_NODE=true" >&2 exit 1 fi @@ -9,7 +9,7 @@ lock=/tmp/certbot.lck updated=/tmp/certbot.updated ensure() { - test -n "$1" && echo "$1 received, exiting gracefully..." + test -n "$1" && echo "ok - $1 received, exiting gracefully..." >&2 rm -f "${lock}" @@ -70,8 +70,8 @@ case $1 in *) # Only one instance can run at a time if test -f "${lock}" ; then - echo "There's a certbotd instance already running, doing nothing..." >&2 - echo "If the problem persists, you may need to remove ${lock} manually." >&2 + echo "not ok - There's a certbotd instance already running, doing nothing..." >&2 + echo "not ok - If the problem persists, you may need to remove ${lock} manually." >&2 exit 1 fi @@ -92,11 +92,14 @@ case $1 in | jq --raw-output .[] \ | while read domain; do # Skip already existing domains - test -d "/etc/letsencrypt/live/${domain}" && continue + if test -d "/etc/letsencrypt/renewal/${domain}.conf" + echo "ok - ${domain} already issued" >&2 + continue + fi # Ignore non local domains if ! nslookup "${domain}" 8.8.8.8 | grep -qE "(${SUTTY_ADDRESSES// /|})" ; then - echo "${domain} is not configured to any Sutty node or DNS records are still cached, ignoring for now" + echo "ok - ${domain} is not configured to any Sutty node or DNS records are still cached, ignoring for now # skip" >&2 continue fi