From 6a4c1b20517da72c590e67e1e2644c720fc50a8b Mon Sep 17 00:00:00 2001 From: David Yang Date: Mon, 27 Apr 2020 09:44:47 +0800 Subject: [PATCH 1/3] acme: Handle log message correctly Error was: logger: unrecognized option: renew Signed-off-by: David Yang --- net/acme/files/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index 1405c70e7..b01003687 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -32,17 +32,17 @@ check_cron() log() { - logger -t acme -s -p daemon.info "$@" + logger -t acme -s -p daemon.info -- "$@" } err() { - logger -t acme -s -p daemon.err "$@" + logger -t acme -s -p daemon.err -- "$@" } debug() { - [ "$DEBUG" -eq "1" ] && logger -t acme -s -p daemon.debug "$@" + [ "$DEBUG" -eq "1" ] && logger -t acme -s -p daemon.debug -- "$@" } get_listeners() { From 0d2240481b75222a4a86195660b7d4b1a6c97f1f Mon Sep 17 00:00:00 2001 From: David Yang Date: Mon, 27 Apr 2020 09:57:09 +0800 Subject: [PATCH 2/3] acme: Handle ecc cert correctly Error was: The domain 'example.com' seems to have a ECC cert already, please add '--ecc' parameter if you want to use that cert. Signed-off-by: David Yang --- net/acme/files/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index b01003687..bec94bcce 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -183,6 +183,7 @@ issue_cert() local update_uhttpd local update_nginx local keylength + local keylength_ecc=0 local domains local main_domain local moved_staging=0 @@ -215,6 +216,7 @@ issue_cert() if echo $keylength | grep -q "^ec-"; then domain_dir="$STATE_DIR/${main_domain}_ecc" + keylength_ecc=1 else domain_dir="$STATE_DIR/${main_domain}" fi @@ -234,6 +236,7 @@ issue_cert() moved_staging=1 else log "Found previous cert config. Issuing renew." + [ "$keylength_ecc" -eq "1" ] && acme_args="$acme_args --ecc" run_acme --home "$STATE_DIR" --renew -d "$main_domain" $acme_args && ret=0 || ret=1 post_checks return $ret From 2e0f44bb34a5727c35a16425f9b5b452109ff35d Mon Sep 17 00:00:00 2001 From: David Yang Date: Mon, 27 Apr 2020 09:59:32 +0800 Subject: [PATCH 3/3] acme: Bump release version Signed-off-by: David Yang --- net/acme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index dc581f500..bc0902910 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme PKG_VERSION:=2.8.5 -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)?