From df07e6b833e97fde2718a5f74feeaa04ad47c099 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 29 Jan 2022 16:58:08 +0200 Subject: [PATCH] luci-app-uhttpd: support 'organization' option Support the organization option, added in 2020. Mention in help text that a random/unique value is used in certificate generation if the organization option is empty. Re-order the certificate items to logical order. Signed-off-by: Hannu Nyman (cherry picked from commit e3fbfe99094cc27ea7ad551fea193bc67c201ef0) --- .../luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua index 20929036d7..940f09873b 100644 --- a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua +++ b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua @@ -218,13 +218,15 @@ o.datatype = "min(1024)" o = s:option(Value, "commonname", translate("Server Hostname"), translate("a.k.a CommonName")) o.default = luci.sys.hostname() -o = s:option(Value, "country", translate("Country")) -o.default = "ZZ" +o = s:option(Value, "organization", translate("Organization"), translate("If empty, a random/unique value is used in cert generation")) -o = s:option(Value, "state", translate("State")) +o = s:option(Value, "location", translate("Location")) o.default = "Unknown" -o = s:option(Value, "location", translate("Location")) +o = s:option(Value, "state", translate("State")) o.default = "Unknown" +o = s:option(Value, "country", translate("Country")) +o.default = "ZZ" + return m -- 2.30.2