From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 13 Sep 2021 09:09:07 +0000 (+0200)
Subject: Merge branch 'add-svcb-https-to-record-types' of https://github.com/kpfleming/pdns... 
X-Git-Tag: dnsdist-1.7.0-alpha1~26^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10709%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'add-svcb-https-to-record-types' of https://github.com/kpfleming/pdns into svcb-types
---

0ca41e421a9f2bb1f2dad2afe0761da9421d7d17
diff --cc docs/appendices/types.rst
index d546c51004,8b55c3438c..0780af7945
--- a/docs/appendices/types.rst
+++ b/docs/appendices/types.rst
@@@ -141,13 -141,6 +141,13 @@@ HINF
  Hardware Info record, used to specify CPU and operating system. Stored
  with a single space separating these two, example: 'i386 Linux'.
  
 +.. _types-https:
 +
 +HTTPS
 +-----
- Service binding records for HTTPS, defined in `draft-ietf-dnsop-svcb-https-07 <https://datatracker.ietf.org/doc/draft-ietf-dnsop-svcb-https/07>`__, including additional processing.
- Some :doc:`PowerDNS specials <../guides/svcb>` are supported.
++
++See :ref:`SVCB <types-svcb>` for more information.
 +
  .. _types-key:
  
  KEY
@@@ -307,13 -300,20 +307,26 @@@ priority. For example
  be encoded with ``0`` in the priority field and
  ``100 389 mars.conaxis.ch`` in the content field.
  
 +.. _types-svcb:
 +
- SVCB
- ----
- Service binding records, defined in `draft-ietf-dnsop-svcb-https-07 <https://datatracker.ietf.org/doc/draft-ietf-dnsop-svcb-https/07>`__, including additional processing.
- Some :doc:`PowerDNS specials <../guides/svcb>` are supported.
+ SVCB, HTTPS
+ -----------
++.. versionadded:: 4.4.0
+ 
 -Since 4.4. SVCB records, defined in
 -(`draft-ietf-dnsop-svcb-https-07.html
++SVCB records, defined in
++(`draft-ietf-dnsop-svcb-https-07
+ <https://www.ietf.org/archive/id/draft-ietf-dnsop-svcb-https-07.html>`__)
+ are used to facilitate the lookup of information needed to make
+ connections to network services. SVCB records allow a service to be
+ provided from multiple alternative endpoints, each with associated
+ parameters (such as transport protocol configuration and keys for
+ encrypting the TLS ClientHello). They also enable aliasing of apex
+ domains, which is not possible with CNAME. The HTTPS RR is a variation
+ of SVCB for HTTPS and HTTP origins.
+ 
++Additional processing is supported for these types.
++Some :doc:`PowerDNS extensions <../guides/svcb>` for automatic IP address hints exist as well.
 +
  TKEY, TSIG
  ----------