From e039bd4da7d63c0ec95873ac9f855656869f7054 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Thu, 25 Jun 2020 19:40:38 +0000 Subject: [PATCH] https-dns-proxy: bugfix: remove eDNS support Signed-off-by: Stan Grishin --- net/https-dns-proxy/Makefile | 4 ---- net/https-dns-proxy/files/README.md | 5 ++--- net/https-dns-proxy/files/https-dns-proxy.init | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 5e97fb868..61ee5b42d 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -26,10 +26,6 @@ define Package/https-dns-proxy CONFLICTS:=https_dns_proxy endef -define Package/https-dns-proxy/conffiles -/etc/config/https-dns-proxy -endef - define Package/https-dns-proxy/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d ${1}/etc/config $(INSTALL_BIN) $(PKG_BUILD_DIR)/https_dns_proxy $(1)/usr/sbin/https-dns-proxy diff --git a/net/https-dns-proxy/files/README.md b/net/https-dns-proxy/files/README.md index 87e548462..f2435490d 100644 --- a/net/https-dns-proxy/files/README.md +++ b/net/https-dns-proxy/files/README.md @@ -1,6 +1,6 @@ # DNS Over HTTPS Proxy (https-dns-proxy) -A lean RFC8484-compatible (no JSON API support) DNS-over-HTTPS (DoH) proxy service which supports DoH servers ran by AdGuard, CleanBrowsing, Cloudflare, Google, ODVR (nic.cz) and Quad9. Please see the [README](https://github.com/stangri/openwrt_packages/blob/master/https-dns-proxy/files/README.md) for further information. Based on [@aarond10](https://github.com/aarond10)'s [https-dns-proxy](https://github.com/aarond10/https_dns_proxy). +A lean RFC8484-compatible (no JSON API support) DNS-over-HTTPS (DoH) proxy service which supports DoH servers ran by AdGuard, CleanBrowsing, Cloudflare, Google, ODVR (nic.cz) and Quad9. Based on [@aarond10](https://github.com/aarond10)'s [https-dns-proxy](https://github.com/aarond10/https_dns_proxy). ## Features @@ -11,7 +11,7 @@ A lean RFC8484-compatible (no JSON API support) DNS-over-HTTPS (DoH) proxy servi ## Screenshots (luci-app-https-dns-proxy) -![screenshot](https://raw.githubusercontent.com/stangri/openwrt_packages/master/screenshots/https-dns-proxy/screenshot01.png "https-dns-proxy screenshot") +![screenshot](https://cdn.jsdelivr.net/gh/stangri/openwrt_packages@master/screenshots/https-dns-proxy/screenshot01.png "https-dns-proxy screenshot") ## Requirements @@ -78,7 +78,6 @@ The https-dns-proxy instance settings are: |Parameter|Type|Default|Description| | --- | --- | --- | --- | |bootstrap_dns|IP Address||The non-encrypted DNS servers to be used to resolve the DoH server name on start.| -|edns_subnet|Subnet||EDNS Subnet address can be supplied to supported DoH servers to provide local resolution results.| |listen_addr|IP Address|127.0.0.1|The local IP address to listen to requests.| |listen_port|port|5053 and up|If this setting is omitted, the service will start the first https-dns-proxy instance on port 5053, second on 5054 and so on.| |logfile|Full filepath||Full filepath to the file to log the instance events to.| diff --git a/net/https-dns-proxy/files/https-dns-proxy.init b/net/https-dns-proxy/files/https-dns-proxy.init index e4a4d3b73..1614d9096 100755 --- a/net/https-dns-proxy/files/https-dns-proxy.init +++ b/net/https-dns-proxy/files/https-dns-proxy.init @@ -42,7 +42,6 @@ start_instance() { append_parm "$cfg" 'resolver_url' '-r' append_parm "$cfg" 'user' '-u' 'nobody' append_parm "$cfg" 'group' '-g' 'nogroup' - append_parm "$cfg" 'edns_subnet' '-e' append_parm "$cfg" 'proxy_server' '-t' append_parm "$cfg" 'logfile' '-l' append_bool "$cfg" 'use_http1' '-x'