AdGuardHome: bump to r1740-32f7803

package/jsda/AdGuardHome/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=AdGuardHome
 PKG_VERSION:=snapshot
-PKG_RELEASE:=d9ee9b8
+PKG_RELEASE:=r1740-32f7803
 
 ifeq ($(ARCH),x86_64)
 	PKG_ARCH_AdGuardHome:=linux_amd64
@@ -70,7 +70,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/AdGuardHome/AdGuardHome $(1)/usr/bin/AdGuardHome
 	$(INSTALL_DIR) $(1)/etc/AdGuardHome
-	$(INSTALL_CONF) ./files/conf/$(ADG_CONF_NAME).yaml $(1)/etc/AdGuardHome/AdGuardHome.yaml
+	$(INSTALL_CONF) ./conf/$(ADG_CONF_NAME).yaml $(1)/etc/AdGuardHome/AdGuardHome.yaml
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

package/jsda/AdGuardHome/conf/big_space.yaml

@@ -1,21 +1,23 @@
-bind_host: 0.0.0.0 
+bind_host: 0.0.0.0
 bind_port: 3001
 users:
 - name: AdGuardHome
   password: $2y$05$r.WXZfS0JbDj01xXmScIiuFPirVYB2FXmH0o1CUgyECxPNMlkWorq
 language: zh-cn
-rlimit_nofile: 0
+rlimit_nofile: 61500
+web_session_ttl: 720
 dns:
   bind_host: 0.0.0.0
   port: 5333
   statistics_interval: 30
-  protection_enabled: true
-  filtering_enabled: true
-  filters_update_interval: 24
-  blocking_mode: nxdomain
-  blocked_response_ttl: 3000
   querylog_enabled: true
   querylog_interval: 30
+  querylog_memsize: 0
+  protection_enabled: true
+  blocking_mode: nxdomain
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 3000
   ratelimit: 0
   ratelimit_whitelist: []
   refuse_any: false
@@ -23,21 +25,19 @@ dns:
   - 1.0.0.1:53
   - 2606:4700:4700::1001:53
   all_servers: true
+  edns_client_subnet: 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: ""
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  cache_size: 2000000
   upstream_dns:
   - 202.141.178.13:5353
   - 202.38.93.153:5353
   - 202.141.162.123:5353
-  - https://https://neatdns.ustclug.org/resolve
+  - https://neatdns.ustclug.org/resolve
   - https://dns.rubyfish.cn/dns-query
   - https://ndns.233py.com/dns-query
   - https://edns.233py.com/dns-query
@@ -59,6 +59,18 @@ dns:
   - tls://dns.google
   - tls://1dot1dot1dot1.cloudflare-dns.com
   - https://dns9.quad9.net/dns-query
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_sensitivity: 0
+  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: []
 tls:
   enabled: false
   server_name: ""
@@ -67,6 +79,8 @@ tls:
   port_dns_over_tls: 853
   certificate_chain: ""
   private_key: ""
+  certificate_path: ""
+  private_key_path: ""
 filters:
 - enabled: true
   url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt
@@ -213,4 +227,4 @@ dhcp:
 clients: []
 log_file: ""
 verbose: false
-schema_version: 3
+schema_version: 6

package/jsda/AdGuardHome/conf/small_flash.yaml

@@ -1,21 +1,23 @@
-bind_host: 0.0.0.0 
+bind_host: 0.0.0.0
 bind_port: 3001
 users:
 - name: AdGuardHome
   password: $2y$05$r.WXZfS0JbDj01xXmScIiuFPirVYB2FXmH0o1CUgyECxPNMlkWorq
 language: zh-cn
-rlimit_nofile: 0
+rlimit_nofile: 61500
+web_session_ttl: 720
 dns:
   bind_host: 0.0.0.0
   port: 5333
-  statistics_interval: 1
-  protection_enabled: true
-  filtering_enabled: true
-  filters_update_interval: 24
-  blocking_mode: nxdomain
-  blocked_response_ttl: 3000
+  statistics_interval: 30
   querylog_enabled: true
-  querylog_interval: 1
+  querylog_interval: 30
+  querylog_memsize: 0
+  protection_enabled: true
+  blocking_mode: nxdomain
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 3000
   ratelimit: 0
   ratelimit_whitelist: []
   refuse_any: false
@@ -23,21 +25,19 @@ dns:
   - 1.0.0.1:53
   - 2606:4700:4700::1001:53
   all_servers: true
+  edns_client_subnet: 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: ""
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  cache_size: 100000
   upstream_dns:
   - 202.141.178.13:5353
   - 202.38.93.153:5353
   - 202.141.162.123:5353
-  - https://https://neatdns.ustclug.org/resolve
+  - https://neatdns.ustclug.org/resolve
   - https://dns.rubyfish.cn/dns-query
   - https://ndns.233py.com/dns-query
   - https://edns.233py.com/dns-query
@@ -59,6 +59,18 @@ dns:
   - tls://dns.google
   - tls://1dot1dot1dot1.cloudflare-dns.com
   - https://dns9.quad9.net/dns-query
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_sensitivity: 0
+  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: []
 tls:
   enabled: false
   server_name: ""
@@ -67,6 +79,8 @@ tls:
   port_dns_over_tls: 853
   certificate_chain: ""
   private_key: ""
+  certificate_path: ""
+  private_key_path: ""
 filters:
 - enabled: true
   url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
@@ -86,11 +100,11 @@ filters:
   id: 4
 - enabled: true
   url: https://raw.githubusercontent.com/523860169/list/master/ad.txt
-  name: Diablo AdFilters
+  name: My AdFilters
   id: 1553073381
 - enabled: true
   url: http://tools.yiclear.com/ChinaList2.0.txt
-  name: ChinaListV2.0[20190224001]
+  name: ChinaListV2.0[20191126000]
   id: 1553073382
 - enabled: true
   url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
@@ -133,4 +147,4 @@ dhcp:
 clients: []
 log_file: ""
 verbose: false
-schema_version: 3
+schema_version: 6