ad

2025-01-08 11:57:57 +08:00 · 2022-09-15 19:32:54 +08:00 · 2022-09-15 19:32:54 +08:00 · 5d411e170e
commit 5d411e170e
parent 2869b2624c
5 changed files with 342 additions and 6 deletions
--- a/adguardhome/Makefile
+++ b/adguardhome/Makefile
@ -6,11 +6,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.8
-PKG_RELEASE:=57
+PKG_VERSION:=0.107.13
+PKG_RELEASE:=65

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e73605c4c541c13aa36e6a5b114450d3113ceec4
+PKG_SOURCE_VERSION:=77d04d44eb080500f79e1329f943decb976d1817
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
 PKG_MIRROR_HASH:=skip

--- a/luci-app-adguardhome/Makefile
+++ b/luci-app-adguardhome/Makefile
@ -4,8 +4,6 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-adguardhome
-PKG_VERSION:=1.8
-PKG_RELEASE:=12
 PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>

 LUCI_TITLE:=LuCI app for AdGuardHome
--- a/luci-app-adguardhome/root/etc/AdGuardHome.yaml
+++ b/luci-app-adguardhome/root/etc/AdGuardHome.yaml
@ -0,0 +1,254 @@
+bind_host: 0.0.0.0
+bind_port: 3000
+beta_bind_port: 0
+users:
+- name: admin
+  password: $2y$10$vHRcARdPCieYG3RXWomV5evDYN.Nj/edtwEkQgQJZcK6z7qTLaIc6
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: zh-cn
+debug_pprof: false
+web_session_ttl: 720
+dns:
+  bind_hosts:
+  - 0.0.0.0
+  port: 5553
+  statistics_interval: 1
+  querylog_enabled: true
+  querylog_file_enabled: true
+  querylog_interval: 6h
+  querylog_size_memory: 1000
+  anonymize_client_ip: false
+  protection_enabled: true
+  blocking_mode: default
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 60
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  ratelimit: 0
+  ratelimit_whitelist: []
+  refuse_any: false
+  upstream_dns:
+  - 223.5.5.5
+  upstream_dns_file: ""
+  bootstrap_dns:
+  - 119.29.29.29
+  - 223.5.5.5
+  all_servers: false
+  fastest_addr: false
+  fastest_timeout: 1s
+  allowed_clients: []
+  disallowed_clients: []
+  blocked_hosts:
+  - version.bind
+  - id.server
+  - hostname.bind
+  trusted_proxies:
+  - 127.0.0.0/8
+  - ::1/128
+  cache_size: 4194304
+  cache_ttl_min: 60
+  cache_ttl_max: 86400
+  cache_optimistic: false
+  bogus_nxdomain: []
+  aaaa_disabled: true
+  enable_dnssec: true
+  edns_client_subnet: true
+  max_goroutines: 300
+  ipset: []
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_enabled: false
+  safesearch_enabled: false
+  safebrowsing_enabled: false
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  rewrites: []
+  blocked_services: []
+  upstream_timeout: 10s
+  local_domain_name: lan
+  resolve_clients: true
+  use_private_ptr_resolvers: true
+  local_ptr_upstreams: []
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 784
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  strict_sni_check: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+filters:
+- enabled: true
+  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+  name: AdGuard DNS filter
+  id: 1228750870
+- enabled: true
+  url: https://anti-ad.net/easylist.txt
+  name: 'CHN: anti-AD'
+  id: 1228750871
+- enabled: true
+  url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
+  name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
+  id: 139789181
+- enabled: true
+  url: https://easylist-downloads.adblockplus.org/easylist.txt
+  name: EasyList-去除国际网页中大多数广告，包括不需要的框架、图像和对象
+  id: 139789112
+- enabled: false
+  url: https://easylist-downloads.adblockplus.org/easylistchina.txt
+  name: EasyList China-EasyList针对国内的补充规则
+  id: 139789121
+- enabled: true
+  url: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-easylist.txt
+  name: anti-AD命中率最高列表
+  id: 139789122
+- enabled: true
+  url: https://gitee.com/halflife/list/raw/master/ad.txt
+  name: halflife合并乘风
+  id: 139789131
+- enabled: false
+  url: https://banbendalao.coding.net/p/adgk/d/ADgk/git/raw/master/ADgk.txt
+  name: adgk手机去广告规则
+  id: 139789132
+- enabled: false
+  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt
+  name: 乘风 广告过滤规则
+  id: 139789133
+- enabled: false
+  url: https://raw.githubusercontent.com/BlueSkyXN/AdGuardHomeRules/master/all.txt
+  name: 百万ADH广告拦截过滤规则
+  id: 139789141
+- enabled: false
+  url: https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds-Ultra.txt
+  name: GoodbyeAds 大全去广告
+  id: 139789142
+- enabled: false
+  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt
+  name: 乘风 视频广告过滤规则
+  id: 139789143
+- enabled: false
+  url: https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts
+  name: 1024host
+  id: 139789151
+- enabled: false
+  url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
+  name: Peter Lowe’s Ad and tracking server list
+  id: 139789152
+- enabled: false
+  url: https://easylist.to/easylist/fanboy-social.txt
+  name: Fanboy's Social Blocking List
+  id: 139789153
+- enabled: false
+  url: https://easylist.to/easylist/fanboy-annoyance.txt
+  name: Fanboy's Annoyance List
+  id: 139789154
+- enabled: false
+  url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
+  name: EasyList Cookie List
+  id: 139789155
+- enabled: false
+  url: https://fanboy.co.nz/fanboy-antifacebook.txt
+  name: Anti-Facebook List
+  id: 139789161
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/14.txt
+  name: AdGuard Annoyances filter
+  id: 139789162
+- enabled: false
+  url: https://www.malwaredomainlist.com/hostslist/hosts.txt
+  name: MalwareDomainList.com Hosts List
+  id: 139789163
+- enabled: false
+  url: https://www.fanboy.co.nz/enhancedstats.txt
+  name: Fanboy's Enhanced Tracking List
+  id: 139789164
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/3.txt
+  name: AdGuard Tracking Protection filter
+  id: 139789165
+- enabled: false
+  url: https://easylist.to/easylist/easylist.txt
+  name: EasyList
+  id: 139789171
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/11.txt
+  name: AdGuard Mobile Ads filter
+  id: 139789172
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
+  name: AdGuard Base filter
+  id: 139789173
+- enabled: false
+  url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
+  name: Adblock Warning Removal List
+  id: 139789174
+- enabled: false
+  url: https://fanboy.co.nz/fanboy-problematic-sites.txt
+  name: Fanboy's problematic-sites
+  id: 139789175
+- enabled: false
+  url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
+  name: Adbyby Lazy Rule
+  id: 139789182
+- enabled: false
+  url: https://raw.githubusercontent.com/VeleSila/yhosts/master/hosts.txt
+  name: hosts
+  id: 139789183
+- enabled: false
+  url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt
+  name: aak-cont-list-notubo
+  id: 139789184
+- enabled: false
+  url: https://adaway.org/hosts.txt
+  name: Adaway HOST
+  id: 139789187
+whitelist_filters: []
+user_rules:
+- '@@||taobao.com^$important'
+- '@@||tmall.com^$important'
+- '@@||jd.com^important'
+- '@@||flyme.cn^$important'
+- '@@||meizu.com^$important'
+- '@@||flydigi.com^'
+- '@@||pv.sohu.com^$important'
+dhcp:
+  enabled: false
+  interface_name: ""
+  dhcpv4:
+    gateway_ip: ""
+    subnet_mask: ""
+    range_start: ""
+    range_end: ""
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: []
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+clients: []
+log_compress: false
+log_localtime: false
+log_max_backups: 0
+log_max_size: 100
+log_max_age: 3
+log_file: ""
+verbose: false
+os:
+  group: ""
+  user: ""
+  rlimit_nofile: 0
+schema_version: 10
--- a/luci-app-adguardhome/root/etc/config/AdGuardHome.yaml
+++ b/luci-app-adguardhome/root/etc/config/AdGuardHome.yaml
@ -90,6 +90,10 @@ tls:
  certificate_path: ""
  private_key_path: ""
 filters:
+- enabled: true
+  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+  name: AdGuard DNS filter
+  id: 1228750870
 - enabled: true
  url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
  name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
@ -126,6 +130,86 @@ filters:
  url: https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds-Ultra.txt
  name: GoodbyeAds 大全去广告
  id: 139789142
+- enabled: false
+  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt
+  name: 乘风 视频广告过滤规则
+  id: 139789143
+- enabled: false
+  url: https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts
+  name: 1024host
+  id: 139789151
+- enabled: false
+  url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
+  name: Peter Lowe’s Ad and tracking server list
+  id: 139789152
+- enabled: false
+  url: https://easylist.to/easylist/fanboy-social.txt
+  name: Fanboy's Social Blocking List
+  id: 139789153
+- enabled: false
+  url: https://easylist.to/easylist/fanboy-annoyance.txt
+  name: Fanboy's Annoyance List
+  id: 139789154
+- enabled: false
+  url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
+  name: EasyList Cookie List
+  id: 139789155
+- enabled: false
+  url: https://fanboy.co.nz/fanboy-antifacebook.txt
+  name: Anti-Facebook List
+  id: 139789161
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/14.txt
+  name: AdGuard Annoyances filter
+  id: 139789162
+- enabled: false
+  url: https://www.malwaredomainlist.com/hostslist/hosts.txt
+  name: MalwareDomainList.com Hosts List
+  id: 139789163
+- enabled: false
+  url: https://www.fanboy.co.nz/enhancedstats.txt
+  name: Fanboy's Enhanced Tracking List
+  id: 139789164
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/3.txt
+  name: AdGuard Tracking Protection filter
+  id: 139789165
+- enabled: false
+  url: https://easylist.to/easylist/easylist.txt
+  name: EasyList
+  id: 139789171
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/11.txt
+  name: AdGuard Mobile Ads filter
+  id: 139789172
+- enabled: false
+  url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
+  name: AdGuard Base filter
+  id: 139789173
+- enabled: false
+  url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
+  name: Adblock Warning Removal List
+  id: 139789174
+- enabled: false
+  url: https://fanboy.co.nz/fanboy-problematic-sites.txt
+  name: Fanboy's problematic-sites
+  id: 139789175
+- enabled: false
+  url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
+  name: Adbyby Lazy Rule
+  id: 139789182
+- enabled: false
+  url: https://raw.githubusercontent.com/VeleSila/yhosts/master/hosts.txt
+  name: hosts
+  id: 139789183
+- enabled: false
+  url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt
+  name: aak-cont-list-notubo
+  id: 139789184
+- enabled: false
+  url: https://adaway.org/hosts.txt
+  name: Adaway HOST
+  id: 139789187
 whitelist_filters: []
 user_rules: []
 dhcp:
--- a/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@ -508,7 +508,7 @@ start_service() {
 	if [[ "`uci get bypass.@global[0].global_server 2>/dev/null`" && "`uci get bypass.@global[0].adguardhome 2>/dev/null`" == 1 && "$(uci get dhcp.@dnsmasq[0].port)" == "53" ]]; then
 	 uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
 	 uci commit AdGuardHome
-	 do_redirect 1
+	 _do_redirect 1
 	fi
 }
 reload_service()