diff --git a/package/zxlhhyccc/https-dns-proxy/Makefile b/package/zxlhhyccc/https-dns-proxy/Makefile deleted file mode 100644 index 6e9f8e1cdc..0000000000 --- a/package/zxlhhyccc/https-dns-proxy/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=https_dns_proxy -PKG_VERSION:=2018-04-23 -PKG_RELEASE=3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MIRROR_HASH:=24b7e4238c37e646f33eee3a374f6b7beb5c167b9c5008cc13b51e5f1f3a44ea -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=bea68401330e611f6e9b75cec84e2dc4e81e52de -PKG_MAINTAINER:=Aaron Drew -PKG_LICENSE:=MIT - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/https_dns_proxy - SECTION:=net - CATEGORY:=Network - TITLE:=DNS over HTTPS proxy server - DEPENDS:=+libcares +libcurl +libev +ca-bundle -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/ - $(INSTALL_BIN) ./files/https_dns_proxy.init $(1)/etc/init.d/https_dns_proxy - $(INSTALL_CONF) ./files/https_dns_proxy.config $(1)/etc/config/https_dns_proxy -endef - -$(eval $(call BuildPackage,https_dns_proxy)) diff --git a/package/zxlhhyccc/luci-app-https_dns_proxy/Makefile b/package/zxlhhyccc/luci-app-https_dns_proxy/Makefile index afd2a21fb9..62c6c57540 100644 --- a/package/zxlhhyccc/luci-app-https_dns_proxy/Makefile +++ b/package/zxlhhyccc/luci-app-https_dns_proxy/Makefile @@ -8,7 +8,7 @@ PKG_MAINTAINER:=Stan Grishin LUCI_TITLE:=HTTPS DNS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy -LUCI_DEPENDS:=+luci-mod-admin-full +https_dns_proxy +LUCI_DEPENDS:=+luci-mod-admin-full +https-dns-proxy LUCI_PKGARCH:=all PKG_RELEASE:=3 diff --git a/package/zxlhhyccc/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua b/package/zxlhhyccc/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua index 03a3b4e083..4a1cd778e4 100644 --- a/package/zxlhhyccc/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua +++ b/package/zxlhhyccc/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua @@ -55,8 +55,8 @@ uci:foreach("https_dns_proxy", "https_dns_proxy", function(s) end) prov = s3:option(ListValue, "url_prefix", translate("Provider")) -prov:value("https://cloudflare-dns.com/dns-query?ct=application/dns-json&","Cloudflare") -prov:value("https://dns.google.com/resolve?","Google") +prov:value("https://cloudflare-dns.com/dns-query","Cloudflare") +prov:value("https://dns.google/dns-query","Google") prov.write = function(self, section, value) local la_val = la:formvalue(section) local lp_val = lp:formvalue(section) @@ -64,10 +64,10 @@ prov.write = function(self, section, value) if not lp_val then lp_val = n + 5053 end if value and value:match("cloudflare") then uci:set("https_dns_proxy", section, "bootstrap_dns", "1.1.1.1,1.0.0.1") - uci:set("https_dns_proxy", section, "url_prefix", "https://cloudflare-dns.com/dns-query?ct=application/dns-json&") + uci:set("https_dns_proxy", section, "url_prefix", "https://cloudflare-dns.com/dns-query") else uci:set("https_dns_proxy", section, "bootstrap_dns", "8.8.8.8,8.8.4.4") - uci:set("https_dns_proxy", section, "url_prefix", "https://dns.google.com/resolve?") + uci:set("https_dns_proxy", section, "url_prefix", "https://dns.google/dns-query") end uci:set("https_dns_proxy", section, "user", "nobody") uci:set("https_dns_proxy", section, "group", "nogroup") diff --git a/package/zxlhhyccc/https-dns-proxy/files/https_dns_proxy.config b/package/zxlhhyccc/luci-app-https_dns_proxy/root/etc/config/https_dns_proxy similarity index 76% rename from package/zxlhhyccc/https-dns-proxy/files/https_dns_proxy.config rename to package/zxlhhyccc/luci-app-https_dns_proxy/root/etc/config/https_dns_proxy index b5b49ba66e..02b562425e 100644 --- a/package/zxlhhyccc/https-dns-proxy/files/https_dns_proxy.config +++ b/package/zxlhhyccc/luci-app-https_dns_proxy/root/etc/config/https_dns_proxy @@ -2,7 +2,7 @@ config https_dns_proxy option listen_addr '127.0.0.1' option listen_port '5053' option bootstrap_dns '8.8.8.8,8.8.4.4' - option url_prefix 'https://dns.google.com/resolve?' + option url_prefix 'https://dns.google/dns-query' option user 'nobody' option group 'nogroup' option subnet_addr '' @@ -12,7 +12,7 @@ config https_dns_proxy option listen_addr '127.0.0.1' option listen_port '5054' option bootstrap_dns '1.1.1.1,1.0.0.1' - option url_prefix 'https://cloudflare-dns.com/dns-query?ct=application/dns-json&' + option url_prefix 'https://cloudflare-dns.com/dns-query' option user 'nobody' option group 'nogroup' option subnet_addr '' diff --git a/package/zxlhhyccc/https-dns-proxy/files/https_dns_proxy.init b/package/zxlhhyccc/luci-app-https_dns_proxy/root/etc/init.d/https_dns_proxy similarity index 100% rename from package/zxlhhyccc/https-dns-proxy/files/https_dns_proxy.init rename to package/zxlhhyccc/luci-app-https_dns_proxy/root/etc/init.d/https_dns_proxy