mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-29 10:28:53 +03:00
94bceaa84d
Closes #6369.
Co-authored-by: IldarKamalov <ik@adguard.com>
Squashed commit of the following:
commit efc824667a88765d5a16984fd17ecda2559f2b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 15 19:10:47 2023 +0300
all: imp docs
commit 9ec59b59000f005006ea231071329a586d9889ac
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 15 17:21:03 2023 +0300
dnsforward: imp err msg
commit d9710dfc1dcf74d5ee8386b053d7180316f21bce
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 15 15:33:59 2023 +0300
all: upd chlog
commit 29e868b93b15cfce5faed4d0c07b16decbce52f9
Merge: 1c3aec9f1 ebb06a583
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Nov 15 15:26:32 2023 +0300
Merge branch 'master' into 6369-ratelimit-settings-ui
commit 1c3aec9f1478f71afa4d0aa9ba1c454e9d98b8db
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Nov 14 21:21:22 2023 +0300
dnsforward: imp docs
commit 486bf86e5a2b51b6014a231386337a2d1e945c23
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Nov 13 09:57:21 2023 +0300
fix linter
commit aec088f233737fdfa0e7086148ceb79df0d2e39a
Author: Ildar Kamalov <ik@adguard.com>
Date: Sun Nov 12 16:13:46 2023 +0300
client: validate rate limit subnets
commit d4ca4d3a604295cdfaae54e6e461981233eabf3e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 10 20:08:44 2023 +0300
dnsforward: imp code
commit 5c11a1ef5c6fcc786d8496b14b9b16d1de1708cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Nov 10 15:07:56 2023 +0300
all: ratelimit settings
119 lines
2.8 KiB
JSON
119 lines
2.8 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,
|
|
"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,
|
|
"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,
|
|
"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": ""
|
|
}
|
|
}
|