From dbb319ea5cdc97a72ad4c6081f3673fde4864752 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Wed, 23 Mar 2022 16:02:14 +0300 Subject: [PATCH] Pull request: 4276 upd quic port Merge in DNS/adguard-home-wiki from 4276-quic-port to master Squashed commit of the following: commit 534cbca27fd1959a63e07aaa48143cf62aba4ecf Author: Eugene Burkov Date: Tue Mar 22 15:16:42 2022 +0300 Configuration: quic port version history commit b029441a55ea45a1ef59159a43505a95ccfb0361 Author: Eugene Burkov Date: Tue Mar 22 01:32:35 2022 +0300 all: upd quic docs --- Configuration.md | 10 ++++++---- Encryption.md | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Configuration.md b/Configuration.md index 1ea8403..c049212 100644 --- a/Configuration.md +++ b/Configuration.md @@ -74,7 +74,7 @@ Examples: * `https://cloudflare-dns.com/dns-query`: encrypted [DNS-over-HTTPS]. -* `quic://dns-unfiltered.adguard.com:784`: experimental [DNS-over-QUIC] support. +* `quic://dns-unfiltered.adguard.com:853`: experimental [DNS-over-QUIC] support. * `tcp://1.1.1.1`: plain DNS (over TCP). @@ -260,7 +260,7 @@ hostname resolution” setting in the “Upstream DNS servers” section or via [2915]: https://github.com/AdguardTeam/AdGuardHome/issues/2915 [DNS Stamps]: https://dnscrypt.info/stamps/ [DNS-over-HTTPS]: https://en.wikipedia.org/wiki/DNS_over_HTTPS -[DNS-over-QUIC]: https://datatracker.ietf.org/doc/html/draft-ietf-dprive-dnsoquic-03 +[DNS-over-QUIC]: https://datatracker.ietf.org/doc/html/draft-ietf-dprive-dnsoquic-10 [DNS-over-TLS]: https://en.wikipedia.org/wiki/DNS_over_TLS [DNSCrypt]: https://dnscrypt.info/ [dnsmasq-man]: http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html @@ -472,8 +472,10 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib - `server_name` - the hostname of your HTTPS/TLS server. - `force_https` - if true, forces HTTP->HTTPS redirect. - `port_https` - HTTPS port. If `0`, HTTPS is disabled. - - `port_dns_over_tls` - DNS-over-TLS port. If `0`, DOT is disabled. - - `port_dns_over_quic` - DNS-over-QUIC port. If `0`, DOQ is disabled. + - `port_dns_over_tls` - DNS-over-TLS port. If `0`, DNS-over-TLS is disabled. + - `port_dns_over_quic` - DNS-over-QUIC port. If `0`, DNS-over-QUIC is + disabled. Before **v0.108.0-b.5** the default value was `754`, since + **v0.108.0-b.5** it's `853`. - `port_dnscrypt` - DNSCrypt port. If `0`, DNSCrypt is disabled. See [DNSCrypt] for more information and examples. - `dnscrypt_config_file` - DNSCrypt configuration file path. **Must** be set diff --git a/Encryption.md b/Encryption.md index d6befbc..afc5fbf 100644 --- a/Encryption.md +++ b/Encryption.md @@ -5,7 +5,7 @@ protocols **out-of-the-box**: * [DNS-over-HTTPS](https://en.wikipedia.org/wiki/DNS_over_HTTPS) * [DNS-over-TLS](https://en.wikipedia.org/wiki/DNS_over_TLS) - * [DNS-over-QUIC](https://tools.ietf.org/html/draft-ietf-dprive-dnsoquic-01) + * [DNS-over-QUIC](https://tools.ietf.org/html/draft-ietf-dprive-dnsoquic-10) > AdGuard Home also supports [DNSCrypt](https://dnscrypt.info/) (both > client-side and server-side). [Read this](DNSCrypt) to learn about