2fe2d254b5
Merge in DNS/adguard-home from AGDNS-2665-upstream-timeout to master
Squashed commit of the following:
commit b4041c97f2ccd371a9cff8312bda72f4c18496b9
Merge: d939b3b3e b92a3cfb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 7 16:15:19 2025 +0300
Merge branch 'master' into AGDNS-2665-upstream-timeout
commit d939b3b3ef2345d315c05a3730e81e1f1ea9f79f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Feb 7 16:10:06 2025 +0300
client: imp i18n
commit 52089adb6c28d8c47f5a916d9df941c5fddea1fc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 6 18:39:53 2025 +0300
all: fix typo
commit aca08b1873c9f39b8c1da0439a9057117e1dacce
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Feb 6 15:19:30 2025 +0300
client: rearrange upstream timeout settings
commit 48e75fabe2f65aeac7156a020cce3d4c2412e5f9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 4 20:48:53 2025 +0300
github: upd actions cache
commit 64bac193fc834a975e6913bb86a6bf27e54c382a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 4 20:28:54 2025 +0300
all: imp code
commit 95c73698985dc528a4af6ff0d3b8a301da1f0d4a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 3 16:25:35 2025 +0300
all: upstream timeout
123 lines
2.9 KiB
JSON
123 lines
2.9 KiB
JSON
{
|
|
"all_right": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"fallback_dns": [
|
|
"9.9.9.10"
|
|
],
|
|
"protection_enabled": true,
|
|
"protection_disabled_until": null,
|
|
"ratelimit": 0,
|
|
"ratelimit_subnet_len_ipv4": 24,
|
|
"ratelimit_subnet_len_ipv6": 56,
|
|
"ratelimit_whitelist": [],
|
|
"blocking_mode": "default",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"blocked_response_ttl": 10,
|
|
"upstream_timeout": 10,
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": [],
|
|
"edns_cs_use_custom": false,
|
|
"edns_cs_custom_ip": ""
|
|
},
|
|
"fastest_addr": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"fallback_dns": [
|
|
"9.9.9.10"
|
|
],
|
|
"protection_enabled": true,
|
|
"protection_disabled_until": null,
|
|
"ratelimit": 0,
|
|
"ratelimit_subnet_len_ipv4": 24,
|
|
"ratelimit_subnet_len_ipv6": 56,
|
|
"ratelimit_whitelist": [],
|
|
"blocking_mode": "default",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"blocked_response_ttl": 10,
|
|
"upstream_timeout": 10,
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "fastest_addr",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": [],
|
|
"edns_cs_use_custom": false,
|
|
"edns_cs_custom_ip": ""
|
|
},
|
|
"parallel": {
|
|
"upstream_dns": [
|
|
"8.8.8.8:53",
|
|
"8.8.4.4:53"
|
|
],
|
|
"upstream_dns_file": "",
|
|
"bootstrap_dns": [
|
|
"9.9.9.10",
|
|
"149.112.112.10",
|
|
"2620:fe::10",
|
|
"2620:fe::fe:10"
|
|
],
|
|
"fallback_dns": [
|
|
"9.9.9.10"
|
|
],
|
|
"protection_enabled": true,
|
|
"protection_disabled_until": null,
|
|
"ratelimit": 0,
|
|
"ratelimit_subnet_len_ipv4": 24,
|
|
"ratelimit_subnet_len_ipv6": 56,
|
|
"ratelimit_whitelist": [],
|
|
"blocking_mode": "default",
|
|
"blocking_ipv4": "",
|
|
"blocking_ipv6": "",
|
|
"blocked_response_ttl": 10,
|
|
"upstream_timeout": 10,
|
|
"edns_cs_enabled": false,
|
|
"dnssec_enabled": false,
|
|
"disable_ipv6": false,
|
|
"upstream_mode": "parallel",
|
|
"cache_size": 0,
|
|
"cache_ttl_min": 0,
|
|
"cache_ttl_max": 0,
|
|
"cache_optimistic": false,
|
|
"resolve_clients": false,
|
|
"use_private_ptr_resolvers": false,
|
|
"local_ptr_upstreams": [],
|
|
"edns_cs_use_custom": false,
|
|
"edns_cs_custom_ip": ""
|
|
}
|
|
}
|