fork from top adgh

Author: twoone-3

bin/AdGuardHome.yaml AdGuardHome.yamlbin/AdGuardHome.yaml renamed to AdGuardHome.yaml

@@ -10,7 +10,7 @@ users:
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
-language: zh-cn
+language: ""
 theme: auto
 dns:
   bind_hosts:
@@ -23,17 +23,18 @@ dns:
   ratelimit_whitelist: []
   refuse_any: true
   upstream_dns:
-    - https://1.12.12.12/dns-query
-    - https://120.53.53.53/dns-query
+    - 10.35.53.10:3553
+    - '#上面一行用于内网解析,若不用可删'
     - https://223.5.5.5/dns-query
-    - https://223.6.6.6/dns-query
+    - https://1.12.12.12/dns-query
+    - '#一般情况上面两行不可删!禁止填写53端口常规DNS上游'
+    - '#强制使用并行请求，其它禁选'
   upstream_dns_file: ""
   bootstrap_dns:
-    - 1.1.1.1
-    - 8.8.8.8
+    - 10.35.53.10:3553
   fallback_dns:
-    - https://1.1.1.1/dns-query
-  upstream_mode: load_balance
+    - '#此处留空不要填'
+  upstream_mode: parallel
   fastest_timeout: 1s
   allowed_clients: []
   disallowed_clients: []
@@ -44,10 +45,10 @@ dns:
   trusted_proxies:
     - 127.0.0.0/8
     - ::1/128
-  cache_size: 33554432
+  cache_size: 4194304
   cache_ttl_min: 0
-  cache_ttl_max: 0
-  cache_optimistic: true
+  cache_ttl_max: 300
+  cache_optimistic: false
   bogus_nxdomain: []
   aaaa_disabled: false
   enable_dnssec: false
@@ -69,13 +70,14 @@ dns:
   serve_http3: false
   use_http3_upstreams: false
   serve_plain_dns: true
+  hostsfile_enabled: true
 tls:
   enabled: false
   server_name: ""
   force_https: false
   port_https: 443
   port_dns_over_tls: 853
-  port_dns_over_quic: 784
+  port_dns_over_quic: 853
   port_dnscrypt: 0
   dnscrypt_config_file: ""
   allow_unencrypted_doh: false
@@ -85,20 +87,22 @@ tls:
   private_key_path: ""
   strict_sni_check: false
 querylog:
+  dir_path: ""
   ignored: []
   interval: 6h
   size_memory: 1000
   enabled: true
   file_enabled: true
 statistics:
+  dir_path: ""
   ignored: []
   interval: 24h
   enabled: true
 filters:
   - enabled: true
-    url: https://raw.githubusercontent.com/TG-Twilight/AWAvenue-Ads-Rule/main/AWAvenue-Ads-Rule.txt
-    name: 秋风广告规则
-    id: 10086
+    url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_53.txt
+    name: AWAvenue Ads Rule
+    id: 1721028739
 whitelist_filters: []
 user_rules: []
 dhcp:
@@ -142,8 +146,8 @@ filtering:
   safesearch_cache_size: 1048576
   parental_cache_size: 1048576
   cache_time: 30
-  filters_update_interval: 168
-  blocked_response_ttl: 30
+  filters_update_interval: 24
+  blocked_response_ttl: 10
   filtering_enabled: true
   parental_enabled: false
   safebrowsing_enabled: false
@@ -162,10 +166,10 @@ log:
   max_size: 100
   max_age: 3
   compress: false
-  local_time: true
+  local_time: false
   verbose: false
 os:
   group: ""
   user: ""
   rlimit_nofile: 0
-schema_version: 27
+schema_version: 28

apply_iptables.sh

@@ -1,8 +1,16 @@
-if [ "$ARCH" != "arm64" ]; then
-  abort "仅支持 arm64 架构，安装失败"
+ui_print " -------------------------- "
+ui_print " ------ 安装中，请稍等 ------ "
+sleep 1
+cp "$MODPATH/module.prop" "$MODPATH/t_module"
+if [ "$IS64BIT" = 'true' ]; then
+	cp "$MODPATH/linux_arm64/AdGuardHome" "$MODPATH/AdGuardHome" > /dev/null 2>&1
+ui_print " -------------------------- "
+else
+	cp "$MODPATH/linux_armv7/AdGuardHome" "$MODPATH/AdGuardHome" > /dev/null 2>&1
+ui_print " -------------------------- "
 fi
-
-ADG_DIR="$MODPATH/bin"
-chmod +x "$ADG_DIR/AdGuardHome" "$MODPATH/apply_iptables.sh" "$MODPATH/flush_iptables.sh"
-
-ui_print "安装成功，请重启设备"
+sleep 1
+rm -rf "$MODPATH/linux_arm64"
+rm -rf "$MODPATH/linux_armv7"
+ui_print " ----- 安装已完成，请重启 ---- "
+ui_print " -------------------------- "