diff options
| author | Georgi Valkov <gvalkov@abv.bg> | 2021-10-04 22:03:16 +0300 |
|---|---|---|
| committer | Toke Høiland-Jørgensen <toke@toke.dk> | 2021-10-10 09:35:41 +0200 |
| commit | 468fc5fca429ca4276dfcfb4136a0d741ed9038b (patch) | |
| tree | d20d1c4e93a2ccbf3594dd892e8e341d22d765ac /net/acme | |
| parent | a5de3d04557eccd1db58a35ab9f76b38eab4bfb4 (diff) | |
acme: update to 3.0.1
Default to letsencrypt because the upstream default may change.
Passing --staging is no longer needed, since --serever will
select a staging server if needed.
Signed-off-by: Georgi Valkov <gvalkov@abv.bg>
Tested-by: Georgi Valkov <gvalkov@abv.bg>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Diffstat (limited to 'net/acme')
| -rw-r--r-- | net/acme/Makefile | 4 | ||||
| -rw-r--r-- | net/acme/files/run.sh | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net/acme/Makefile b/net/acme/Makefile index 90c0b5909..f93e1d439 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme -PKG_VERSION:=2.9.0 +PKG_VERSION:=3.0.1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)? -PKG_HASH:=bb8cfb8333bc9e986bb8b7644d518bc238b353c871c343b7edf8cda7b7dd903c +PKG_HASH:=6212cc0c2bca99a7dd6cbb4236b4c7dd5d1113dab0841e66dae4d307d902a8e6 PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION) PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk> diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index 2401c95f1..252276fef 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -275,11 +275,17 @@ issue_cert() { acme_args="$acme_args $(for d in $domains; do echo -n "-d $d "; done)" acme_args="$acme_args --keylength $keylength" [ -n "$ACCOUNT_EMAIL" ] && acme_args="$acme_args --accountemail $ACCOUNT_EMAIL" - [ "$use_staging" -eq "1" ] && acme_args="$acme_args --staging" if [ -n "$acme_server" ]; then log "Using custom ACME server URL" acme_args="$acme_args --server $acme_server" + else + # default to letsencrypt because the upstream default may change + if [ "$use_staging" -eq "1" ]; then + acme_args="$acme_args --server letsencrypt_test" + else + acme_args="$acme_args --server letsencrypt" + fi fi if [ -n "$days" ]; then |