From 7235249df6bdec1e713dbe8816e696eca268effd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 23 Oct 2019 12:21:32 +0200 Subject: [PATCH 1/2] acme: Log acme.sh command invocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Toke Høiland-Jørgensen --- net/acme/Makefile | 2 +- net/acme/files/run.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 613d96ebf..b85636f84 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme PKG_VERSION:=2.8.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)? diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index b7a6f1899..3d25321d7 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -54,6 +54,12 @@ get_listeners() { done } +run_acme() +{ + debug "Running acme.sh as '$ACME $@'" + $ACME "$@" +} + pre_checks() { main_domain="$1" @@ -218,7 +224,7 @@ issue_cert() moved_staging=1 else log "Found previous cert config. Issuing renew." - $ACME --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1 + run_acme --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1 post_checks return $ret fi @@ -246,7 +252,7 @@ issue_cert() acme_args="$acme_args --webroot $webroot" fi - if ! $ACME --home "$STATE_DIR" --issue $acme_args; then + if ! run_acme --home "$STATE_DIR" --issue $acme_args; then failed_dir="$STATE_DIR/${main_domain}.failed-$(date +%s)" err "Issuing cert for $main_domain failed. Moving state to $failed_dir" [ -d "$STATE_DIR/$main_domain" ] && mv "$STATE_DIR/$main_domain" "$failed_dir" From 1653894091833a40125999025e4dbf60ed9bcb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 23 Oct 2019 12:22:31 +0200 Subject: [PATCH 2/2] acme: Update to upstream 2.8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream release message: "Letsencrypt CA recent changed the CDN provider, which resulted in hanging issues. Any downstream package should update. This is important." Signed-off-by: Toke Høiland-Jørgensen --- net/acme/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index b85636f84..fa70cdc78 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme -PKG_VERSION:=2.8.1 -PKG_RELEASE:=3 +PKG_VERSION:=2.8.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)? -PKG_HASH:=4fc55b2112058e563616893fefb56c5ff4895a7e6327e9f8416797fdc44d98e3 +PKG_HASH:=bdec71377a764919ac277e26d71ef7e24087f7f05171921888b70de6ab6e2cbc PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION) PKG_MAINTAINER:=Toke Høiland-Jørgensen