fix: tap
This commit is contained in:
parent
919706b80e
commit
ffed22b2df
1 changed files with 17 additions and 9 deletions
26
certbotd.sh
26
certbotd.sh
|
@ -1,7 +1,15 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
ok() {
|
||||||
|
echo "ok - $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
not_ok() {
|
||||||
|
echo "not ok - $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
if test -z "${NODES}" && test -z "${SINGLE_NODE}"; then
|
if test -z "${NODES}" && test -z "${SINGLE_NODE}"; then
|
||||||
echo "not ok - The env var NODES is empty, if you don't want to synchronize to other servers, set SINGLE_NODE=true" >&2
|
not_ok "The env var NODES is empty, if you don't want to synchronize to other servers, set SINGLE_NODE=true"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -9,7 +17,7 @@ lock=/tmp/certbot.lck
|
||||||
updated=/tmp/certbot.updated
|
updated=/tmp/certbot.updated
|
||||||
|
|
||||||
ensure() {
|
ensure() {
|
||||||
test -n "$1" && echo "ok - $1 received, exiting gracefully..." >&2
|
test -n "$1" && ok "$1 received, exiting gracefully..."
|
||||||
|
|
||||||
if test -f "${updated}" ; then
|
if test -f "${updated}" ; then
|
||||||
rm -f "${updated}"
|
rm -f "${updated}"
|
||||||
|
@ -68,8 +76,8 @@ case $1 in
|
||||||
*)
|
*)
|
||||||
# Only one instance can run at a time
|
# Only one instance can run at a time
|
||||||
if test -f "${lock}" ; then
|
if test -f "${lock}" ; then
|
||||||
echo "not ok - There's a certbotd instance already running, doing nothing..." >&2
|
not_ok "There's a certbotd instance already running, doing nothing..."
|
||||||
echo "not ok - If the problem persists, you may need to remove ${lock} manually." >&2
|
not_ok "If the problem persists, you may need to remove ${lock} manually."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -90,21 +98,21 @@ case $1 in
|
||||||
| jq --raw-output .[] \
|
| jq --raw-output .[] \
|
||||||
| while read domain; do
|
| while read domain; do
|
||||||
if test -z "${domain}"; then
|
if test -z "${domain}"; then
|
||||||
echo "not ok - domain is empty" >&2
|
not_ok "domain is empty"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Skip already existing domains
|
# Skip already existing domains
|
||||||
if test -s "/etc/letsencrypt/renewal/${domain}.conf"; then
|
if test -s "/etc/letsencrypt/renewal/${domain}.conf"; then
|
||||||
echo "ok - ${domain} already issued" >&2
|
ok "${domain} already issued"
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
echo "ok - ${domain} renewal conf was empty, fixing..." >&2
|
ok "${domain} renewal conf was empty, fixing..."
|
||||||
|
|
||||||
other_renewal="$(grep -l -m 1 "^authenticator = webroot$" /etc/letsencrypt/renewal/*.conf | head -1)"
|
other_renewal="$(grep -l -m 1 "^authenticator = webroot$" /etc/letsencrypt/renewal/*.conf | head -1)"
|
||||||
|
|
||||||
if test -z "${other_renewal}"; then
|
if test -z "${other_renewal}"; then
|
||||||
echo "not ok - ${domain} couldn't fix" >&2
|
not_ok "${domain} couldn't fix"
|
||||||
ensure 1
|
ensure 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -114,7 +122,7 @@ case $1 in
|
||||||
|
|
||||||
# Ignore non local domains
|
# Ignore non local domains
|
||||||
if ! nslookup "${domain}" 8.8.8.8 | grep -qE "(${SUTTY_ADDRESSES// /|})" ; then
|
if ! nslookup "${domain}" 8.8.8.8 | grep -qE "(${SUTTY_ADDRESSES// /|})" ; then
|
||||||
echo "ok - ${domain} is not configured to any Sutty node or DNS records are still cached, ignoring for now # skip" >&2
|
ok "${domain} is not configured to any Sutty node or DNS records are still cached, ignoring for now # skip"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue