From 558525783cf33a986efa33d23f5283b33a6c936e Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Thu, 25 Jun 2020 20:06:52 +0000 Subject: [PATCH] luci-app-https-dns-proxy: bugfix: remove eDNS support Signed-off-by: Stan Grishin --- applications/luci-app-https-dns-proxy/Makefile | 2 +- .../luasrc/model/cbi/https-dns-proxy.lua | 3 --- .../po/templates/https-dns-proxy.pot | 6 +----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index e04e73208f..b18e019aaa 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy LUCI_PKGARCH:=all -PKG_RELEASE:=8 +PKG_RELEASE:=9 include ../../luci.mk diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index a1da93b2f2..4fdaf26a00 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -174,9 +174,6 @@ lp = s3:option(Value, "listen_port", translate("Listen port")) lp.datatype = "port" lp.value = n + 5053 -sa = s3:option(Value, "edns_subnet", translate("EDNS client subnet")) -sa.rmempty = true - ps = s3:option(Value, "proxy_server", translate("Proxy server")) ps.rmempty = true diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index 6a6a072e0e..00931c200a 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -69,10 +69,6 @@ msgstr "" msgid "Disable" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:177 -msgid "EDNS client subnet" -msgstr "" - #: applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm:54 msgid "Enable" msgstr "" @@ -117,7 +113,7 @@ msgstr "" msgid "ODVR (nic.cz)" msgstr "" -#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:180 +#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:177 msgid "Proxy server" msgstr "" -- 2.30.2