Pull request #1572: 4640-imp-upstream-doc

Updates #4640.

Squashed commit of the following:

commit 764b024e7a5a5f6ea2b18b5e13fdc4fa38c49af2
Merge: 7bace870 6856a803
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Aug 19 17:17:44 2022 +0300

    Merge branch 'master' into 4640-imp-upstream-doc

commit 7bace870102633a2b8323c5f448ed38b65f4b482
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Aug 18 19:49:07 2022 +0300

    all: imp upstream examples
This commit is contained in:
Ainar Garipov
2022-08-19 17:36:51 +03:00
parent 6856a80380
commit 1afd73ad0b
6 changed files with 113 additions and 115 deletions

View File

@@ -4405,7 +4405,7 @@
Validatable TLS settings.
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'port_dns_over_quic': 784
'port_dns_over_quic': 853
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
@@ -4427,7 +4427,7 @@
sent.
'type': 'string'
'port_dns_over_quic':
'default': 784
'default': 853
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
'format': 'int64'
@@ -4865,7 +4865,7 @@
'example':
'certificate_path': '/etc/ssl/example.com.cert'
'enabled': true
'port_dns_over_quic': 784
'port_dns_over_quic': 853
'port_dns_over_tls': 853
'port_https': 443
'private_key_path': '/etc/ssl/example.com.key'
@@ -4907,7 +4907,7 @@
DNS-over-TLS and other protocols.
'type': 'boolean'
'port_dns_over_quic':
'default': 784
'default': 853
'description': >
The DNS-over-QUIC port. If `0`, DNS-over-QUIC is disabled.
'format': 'int64'
@@ -5002,8 +5002,7 @@
* `https://unfiltered.adguard-dns.com/dns-query`: encrypted
DNS-over-HTTPS.
* `quic://unfiltered.adguard-dns.com:784`: encrypted DNS-over-QUIC
(experimental).
* `quic://unfiltered.adguard-dns.com`: encrypted DNS-over-QUIC.
* `tcp://94.140.14.140`: plain DNS-over-TCP.