From ef0d16e7fda1e5f71c1e146cc2a2e1978e27e5e6 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 5 Oct 2022 18:19:23 +0300 Subject: [PATCH] Pull request: 3418-clientid-doh Merge in DNS/adguard-home-wiki from 3418-clientid-doh to master Squashed commit of the following: commit 9423a501898e966fa28830f1b10bdac13d8462a7 Author: Ainar Garipov Date: Wed Oct 5 18:10:38 2022 +0300 Clients: doh clientid in srvname --- Clients.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Clients.md b/Clients.md index dadeefa..2ada723 100644 --- a/Clients.md +++ b/Clients.md @@ -79,7 +79,7 @@ There are several options to do this. ClientIDs are identifiers that can be used with the following DNS protocols: DNS-over-HTTPS, DNS-over-TLS, and DNS-over-QUIC. To use this identifier, -clients should perform queries using a special domain name. For example: +clients should perform queries using a special domain name or URL. For example: * AdGuard Home has the domain name `example.org`. @@ -87,12 +87,19 @@ clients should perform queries using a special domain name. For example: * On the client device you can now configure: - * **DNS-over-HTTPS:** `https://example.org/dns-query/my-client`; - * **DNS-over-TLS:** `tls://my-client.example.org` (requires a [wildcard - certificate][wild]); + * **DNS-over-HTTPS:** `https://example.org/dns-query/my-client`. + + **Since **v0.108.0-b.18:** `https://my-client.example.org/dns-query` + (requires a [wildcard certificate][wild]). **NOTE:** The URL ClientID + has higher priority than the server-name ClientID. If you use both, + only the URL ClientID is used. + * **DNS-over-QUIC:** `quic://my-client.example.org` (requires a [wildcard certificate][wild]). + * **DNS-over-TLS:** `tls://my-client.example.org` (requires a [wildcard + certificate][wild]). + Note that the TLS certificate must be valid **both** for `*.example.org` **and** `example.org`.