From 73bee1f9b0e4dafddf45baea02cdf06e5a20dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 27 Mar 2024 21:51:49 +0100 Subject: [PATCH] acme-common: backport config fixes from master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport config changes from commit 04ac8c177d9a ("acme-common: simplify config example") from master, and apply the subsequent fixup. This should fix the issue with ACME not working in Luci (resolving #23756). Keep the version number bump as a bugfix (1.0.4) since we have not backported all the ACME changes to 23.05. Signed-off-by: Toke Høiland-Jørgensen --- net/acme-common/Makefile | 2 +- net/acme-common/files/acme.config | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile index ac92fc5642..324b742b60 100644 --- a/net/acme-common/Makefile +++ b/net/acme-common/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme-common -PKG_VERSION:=1.0.3 +PKG_VERSION:=1.0.4 PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_LICENSE:=GPL-3.0-only diff --git a/net/acme-common/files/acme.config b/net/acme-common/files/acme.config index c67c24e78b..8d1c4934b3 100644 --- a/net/acme-common/files/acme.config +++ b/net/acme-common/files/acme.config @@ -5,19 +5,19 @@ config acme config cert 'example_wildcard' option enabled 0 option staging 1 - list domains example.org - list domains sub.example.org - list domains *.sub.example.org - option validation_method dns + list domains "example.org" + list domains "*.example.org" + option validation_method "dns" option dns "dns_freedns" list credentials 'FREEDNS_User="ssladmin@example.org"' list credentials 'FREEDNS_Password="1234"' option calias "example.com" option dalias "dalias.example.com" -config cert 'example' +config cert 'example_subdomain' option enabled 0 option staging 1 - list domains example.org - list domains sub.example.org - validation_method webroot + list domains "example.net" + list domains "www.example.net" + list domains "mail.example.net" + option validation_method "webroot"