From 52df926f10dcafbf5df9dbf0a4b2cdc26874149a Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 29 Jan 2023 17:57:55 +0800 Subject: Fix auto certbot. --- docker/auto-certbot/daemon.bash | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/auto-certbot/daemon.bash b/docker/auto-certbot/daemon.bash index 7e30a7d..d79387e 100755 --- a/docker/auto-certbot/daemon.bash +++ b/docker/auto-certbot/daemon.bash @@ -55,14 +55,14 @@ for domain in "${domains[@]}"; do domain_options=("${domain_options[@]}" -d "$domain") done -options=("${domain_options[@]}") +options=(-n --agree-tos -m "$CRUPEST_EMAIL" --webroot -w /var/www/certbot "${domain_options[@]}") if [ -n "$CRUPEST_AUTO_CERTBOT_POST_HOOK" ]; then printf "You have defined a post hook:\n%s\n" "$CRUPEST_AUTO_CERTBOT_POST_HOOK" options=("${options[@]}" --post-hook "$CRUPEST_AUTO_CERTBOT_POST_HOOK") fi # Use test server to test. -certbot certonly -n --agree-tos --force-renewal --test-cert --dry-run -m "$CRUPEST_EMAIL" --webroot -w /var/www/certbot "${options[@]}" +certbot certonly --force-renewal --test-cert --dry-run "${options[@]}" function check_and_renew_cert { expire_info=$(openssl x509 -enddate -noout -in "$CRUPEST_CERT_PATH") @@ -96,8 +96,7 @@ function check_and_renew_cert { if [ -n "$CRUPEST_AUTO_CERTBOT_RENEW_COMMAND" ]; then $CRUPEST_AUTO_CERTBOT_RENEW_COMMAND else - - certbot renew -n --agree-tos -m "$CRUPEST_EMAIL" --webroot -w /var/www/certbot "${options[@]}" + certbot certonly "${options[@]}" fi fi } -- cgit v1.2.3