diff --git a/package/jsda/AdGuardHome/Makefile b/package/jsda/AdGuardHome/Makefile index 9b052d64b9..d090e82906 100644 --- a/package/jsda/AdGuardHome/Makefile +++ b/package/jsda/AdGuardHome/Makefile @@ -26,21 +26,27 @@ endef ifeq ($(ARCH),x86_64) PKG_ARCH_AdGuardHome:=linux_amd64 + ADG_CONF_NAME:=big_space endif ifeq ($(ARCH),i386) PKG_ARCH_AdGuardHome:=linux_386 + ADG_CONF_NAME:=big_space endif ifeq ($(ARCH),mipsel) PKG_ARCH_AdGuardHome:=linux_mipsle + ADG_CONF_NAME:=small_flash endif ifeq ($(ARCH),mips) PKG_ARCH_AdGuardHome:=linux_mips + ADG_CONF_NAME:=small_flash endif ifeq ($(ARCH),arm) PKG_ARCH_AdGuardHome:=linux_arm + ADG_CONF_NAME:=big_space endif ifeq ($(ARCH),aarch64) PKG_ARCH_AdGuardHome:=linux_arm64 + ADG_CONF_NAME:=big_space endif define Build/Prepare @@ -65,7 +71,7 @@ else $(INSTALL_BIN) $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome $(1)/usr/bin/AdGuardHome endif $(INSTALL_DIR) $(1)/etc/AdGuardHome - $(CP) ./files/etc/AdGuardHome $(1)/etc + $(INSTALL_CONF) ./files/conf/$(ADG_CONF_NAME).yaml $(1)/etc/AdGuardHome/AdGuardHome.yaml endef $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/jsda/AdGuardHome/files/conf/big_space.yaml b/package/jsda/AdGuardHome/files/conf/big_space.yaml new file mode 100644 index 0000000000..7c7c1e9e8c --- /dev/null +++ b/package/jsda/AdGuardHome/files/conf/big_space.yaml @@ -0,0 +1,212 @@ +bind_host: 0.0.0.0 +bind_port: 3001 +auth_name: AdGuardHome +auth_pass: AdGuardHome +language: zh-cn +rlimit_nofile: 0 +dns: + bind_host: 0.0.0.0 + port: 5333 + protection_enabled: true + filtering_enabled: true + blocking_mode: nxdomain + blocked_response_ttl: 3000 + querylog_enabled: true + ratelimit: 0 + ratelimit_whitelist: [] + refuse_any: false + bootstrap_dns: + - 1.0.0.1:53 + - 2606:4700:4700::1001:53 + all_servers: true + allowed_clients: + - 127.0.0.1 + disallowed_clients: [] + blocked_hosts: [] + filtering_temp_filename: "" + parental_sensitivity: 0 + parental_enabled: false + safesearch_enabled: false + safebrowsing_enabled: false + resolveraddress: "" + upstream_dns: + - 202.141.178.13:5353 + - 202.38.93.153:5353 + - 202.141.162.123:5353 + - https://https://neatdns.ustclug.org/resolve + - https://dns.rubyfish.cn/dns-query + - https://ndns.233py.com/dns-query + - https://edns.233py.com/dns-query + - https://wdns.233py.com/dns-query + - https://sdns.233py.com/dns-query + - 1.1.1.1 + - 9.9.9.9 + - 117.50.10.10 + - 119.29.29.29 + - 114.114.114.114 + - 223.5.5.5 + - 208.67.222.222:5353 + - 2606:4700:4700::1111 + - 2606:4700:4700::1001 + - tcp://8.8.8.8 + - tcp://8.8.4.4 + - tcp://2001:4860:4860::8888 + - tcp://2001:4860:4860::8844 + - tls://dns.google + - tls://1dot1dot1dot1.cloudflare-dns.com + - https://dns9.quad9.net/dns-query +tls: + enabled: false + server_name: "" + force_https: false + port_https: 443 + port_dns_over_tls: 853 + certificate_chain: "" + private_key: "" +filters: +- enabled: true + url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt + name: AAK-Cont Filter For AdBlock, Adblock Plus, etc + id: 1565484163 +- enabled: true + url: https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt + name: AakList (Anti-Adblock Killer) + id: 1565484164 +- enabled: true + url: https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt + name: CJX's EasyList Lite + id: 1565484165 +- enabled: true + url: https://easylist-downloads.adblockplus.org/easylistchina.txt + name: EasyList China + id: 1565484166 +- enabled: true + url: https://hosts-file.net/.%5Cad_servers.txt + name: hpHosts’ Ad and tracking servers + id: 1565484167 +- enabled: true + url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext + name: Peter Lowe’s Ad and tracking server list​ + id: 1565484168 +- enabled: true + url: https://easylist.to/easylist/fanboy-social.txt + name: Fanboy's Social Blocking List + id: 1565484169 +- enabled: true + url: https://easylist.to/easylist/fanboy-annoyance.txt + name: Fanboy's Annoyance List + id: 1565484170 +- enabled: true + url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt + name: Fanboy's Cookie List + id: 1565484171 +- enabled: true + url: https://fanboy.co.nz/fanboy-antifacebook.txt + name: Anti-Facebook List + id: 1565484172 +- enabled: true + url: https://filters.adtidy.org/extension/ublock/filters/14.txt + name: AdGuard Annoyances filter + id: 1565484173 +- enabled: true + url: https://raw.githubusercontent.com/Spam404/lists/master/adblock-list.txt + name: Spam404 + id: 1565484174 +- enabled: true + url: https://gitcdn.xyz/repo/NanoMeow/MDLMirror/master/hosts.txt + name: Malware Domain List + id: 1565484176 +- enabled: true + url: https://www.fanboy.co.nz/enhancedstats.txt + name: Fanboy's Enhanced Tracking List + id: 1565484178 +- enabled: true + url: https://easylist.to/easylist/easyprivacy.txt + name: EasyPrivacy + id: 1565484179 +- enabled: true + url: https://filters.adtidy.org/extension/ublock/filters/3.txt + name: AdGuard Tracking Protection filter + id: 1565484180 +- enabled: true + url: https://easylist.to/easylist/easylist.txt + name: EasyList + id: 1565484181 +- enabled: true + url: https://filters.adtidy.org/extension/ublock/filters/11.txt + name: AdGuard Mobile Ads filter + id: 1565484182 +- enabled: true + url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt + name: AdGuard Base filter + id: 1565484183 +- enabled: true + url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt + name: Adblock Warning Removal List + id: 1565484184 +- enabled: true + url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + name: AdGuard Simplified Domain Names filter + id: 1565484185 +- enabled: true + url: http://tools.yiclear.com/ChinaList2.0.txt + name: ChinaListV2.0[20190801000] + id: 1565484186 +- enabled: true + url: https://fanboy.co.nz/fanboy-problematic-sites.txt + name: Fanboy's problematic-sites + id: 1565484187 +- enabled: true + url: http://sub.adtchrome.com/adt-chinalist-easylist.txt + name: ChinaList+EasyList(修正) + id: 1565484188 +- enabled: true + url: https://hosts.nfz.moe/127.0.0.1/full/hosts + name: NeoFelhz Hosts + id: 1565484189 +- enabled: true + url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt + name: Adbyby Lazy Rule + id: 1565484190 +- enabled: true + url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/video.txt + name: Adbyby Video Rule + id: 1565484191 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt + name: uBlock filters – Resource abuse + id: 1565486406 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt + name: uBlock filters + id: 1565486407 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt + name: uBlock filters – Badware risks + id: 1565486408 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/experimental.txt + name: uBlock filters – Experimental + id: 1565486409 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt + name: uBlock filters – Privacy + id: 1565486410 +- enabled: true + url: https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt + name: uBlock filters -- Unbreak + id: 1565486411 +user_rules: [] +dhcp: + enabled: false + interface_name: "" + gateway_ip: "" + subnet_mask: "" + range_start: "" + range_end: "" + lease_duration: 0 + icmp_timeout_msec: 1000 +clients: [] +log_file: "" +verbose: false +schema_version: 3 diff --git a/package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml b/package/jsda/AdGuardHome/files/conf/small_flash.yaml similarity index 100% rename from package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml rename to package/jsda/AdGuardHome/files/conf/small_flash.yaml