From 0768374b7302f8b4fcc40948c4de1918ade55f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 27 Jun 2018 23:06:06 +0200 Subject: [PATCH] acme: Not all fields should be mandatory in Luci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #6370. Signed-off-by: Toke Høiland-Jørgensen --- net/acme/Makefile | 2 +- net/acme/files/acme-cbi.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 205b5f122..a6d618bed 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme PKG_VERSION:=2.7.8 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPLv3 PKG_SOURCE_PROTO:=git diff --git a/net/acme/files/acme-cbi.lua b/net/acme/files/acme-cbi.lua index 264d33531..193699cc3 100644 --- a/net/acme/files/acme-cbi.lua +++ b/net/acme/files/acme-cbi.lua @@ -61,7 +61,7 @@ wr = cs:option(Value, "webroot", translate("Webroot directory"), translate("Webserver root directory. Set this to the webserver " .. "document root to run Acme in webroot mode. The web " .. "server must be accessible from the internet on port 80.")) -wr.rmempty = false +wr.optional = true dom = cs:option(DynamicList, "domains", translate("Domain names"), translate("Domain names to include in the certificate. " .. @@ -75,7 +75,7 @@ dns = cs:option(Value, "dns", translate("DNS API"), "In DNS mode, the domain name does not have to resolve to the router IP. " .. "DNS mode is also the only mode that supports wildcard certificates. " .. "Using this mode requires the acme-dnsapi package to be installed.")) -dns.rmempty = false +dns.optional = true cred = cs:option(DynamicList, "credentials", translate("DNS API credentials"), translate("The credentials for the DNS API mode selected above. " ..