From f187ad1d5d5e86f37760631aef764c4f05dc709f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 8 Jan 2025 19:38:53 +0800 Subject: [PATCH] smartdns: drop local config files Signed-off-by: Tianling Shen --- net/smartdns/Makefile | 6 +++--- net/smartdns/conf/custom.conf | 36 --------------------------------- net/smartdns/conf/smartdns.conf | 31 ---------------------------- 3 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 net/smartdns/conf/custom.conf delete mode 100644 net/smartdns/conf/smartdns.conf diff --git a/net/smartdns/Makefile b/net/smartdns/Makefile index e1534a60aa..9b9a6f3def 100644 --- a/net/smartdns/Makefile +++ b/net/smartdns/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartdns PKG_VERSION:=46 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)? @@ -56,10 +56,10 @@ define Package/smartdns/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/package/openwrt/files/etc/init.d/smartdns $(1)/etc/init.d/smartdns $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/address.conf $(1)/etc/smartdns/address.conf $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/blacklist-ip.conf $(1)/etc/smartdns/blacklist-ip.conf + $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/custom.conf $(1)/etc/smartdns/custom.conf $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/domain-block.list $(1)/etc/smartdns/domain-block.list $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/domain-forwarding.list $(1)/etc/smartdns/domain-forwarding.list - $(INSTALL_CONF) $(CURDIR)/conf/custom.conf $(1)/etc/smartdns/custom.conf - $(INSTALL_CONF) $(CURDIR)/conf/smartdns.conf $(1)/etc/config/smartdns + $(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/files/etc/config/smartdns $(1)/etc/config/smartdns endef $(eval $(call BuildPackage,smartdns)) diff --git a/net/smartdns/conf/custom.conf b/net/smartdns/conf/custom.conf deleted file mode 100644 index 3c4fad4b4a..0000000000 --- a/net/smartdns/conf/custom.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Add custom settings here. -# please read https://pymumu.github.io/smartdns/config/basic-config/ - -speed-check-mode tcp:80,ping - -server 101.6.6.6:5353 -server 202.38.93.153:5353 -server 202.141.162.123:5353 -server 202.141.178.13:5353 -server 2001:da8::666 -server 208.67.222.222:5353 -group fq_dns -exclude-default-group -server 208.67.220.220:5353 -group fq_dns -exclude-default-group - -server-tcp 1.0.0.1 -group fq_dns -exclude-default-group -server-tcp 8.8.4.4 -group fq_dns -exclude-default-group -server-tcp 149.112.112.112 -group fq_dns -exclude-default-group -server-tcp 2606:4700:4700::1001 -group fq_dns -exclude-default-group - -server-tls 115.159.131.230 -host-name dns.rubyfish.cn -server-tls dns.rubyfish.cn -server-tls 1.1.1.1 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 2606:4700:4700::1111 -host-name 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 1dot1dot1dot1.cloudflare-dns.com -group fq_dns -exclude-default-group -server-tls 8.8.8.8 -host-name dns.google -group fq_dns -exclude-default-group -server-tls dns.google -group fq_dns -exclude-default-group - -server-https https://202.38.93.153/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://202.141.178.13/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://[2001:da8:d800:931::153]/resolve -host-name neatdns.ustclug.org -http-host neatdns.ustclug.org -server-https https://neatdns.ustclug.org/resolve -server-https https://rubyfish.cn/dns-query -server-https https://i.233py.com/dns-query -server-https https://9.9.9.9/dns-query -group fq_dns -exclude-default-group -server-https https://dns9.quad9.net/dns-query -group fq_dns -exclude-default-group -server-https https://146.112.41.2/dns-query -host-name doh.opendns.com -http-host doh.opendns.com -group fq_dns -exclude-default-group -server-https https://doh.opendns.com/dns-query -group fq_dns -exclude-default-group diff --git a/net/smartdns/conf/smartdns.conf b/net/smartdns/conf/smartdns.conf deleted file mode 100644 index 0dfb270e0c..0000000000 --- a/net/smartdns/conf/smartdns.conf +++ /dev/null @@ -1,31 +0,0 @@ -config 'smartdns' - option server_name 'smartdns' - option dualstack_ip_selection '1' - option prefetch_domain '1' - option serve_expired '1' - option seconddns_no_speed_check '0' - option seconddns_no_dualstack_selection '0' - option seconddns_no_cache '0' - option tcp_server '0' - option seconddns_tcp_server '0' - option coredump '0' - option port '6053' - option ipv6_server '0' - option redirect 'dnsmasq-upstream' - option seconddns_port '5335' - option seconddns_server_group 'fq_dns' - option seconddns_enabled '1' - option seconddns_no_rule_addr '0' - option seconddns_no_rule_nameserver '0' - option seconddns_no_rule_ipset '0' - option seconddns_no_rule_soa '0' - option enabled '0' - option cache_size '20000' - option rr_ttl '3600' - option rr_ttl_min '5' - list old_redirect 'dnsmasq-upstream' - list old_port '6053' - list old_enabled '0' - -config 'domain-rule' -