acme-common: backport config fixes from master

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 <toke@toke.dk>

diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile
index ac92fc5642f61b9d03d7d0b241be488d7ecb5ae3..324b742b6099b63f5f938ba3507f9092e554b5c3 100644 (file)
--- 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 <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-only

diff --git a/net/acme-common/files/acme.config b/net/acme-common/files/acme.config
index c67c24e78b7ab4d1e8c608c0f3c9ec82dd492593..8d1c4934b34b3074ec7b1a8887d4b5312d8260c3 100644 (file)
--- 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"