Merge pull request #8594 from Habbie/default-publish-cds

[thirdparty/pdns.git] / docs / settings.rst

diff --git a/docs/settings.rst b/docs/settings.rst
index 17e7e7f6318cd7cf2b28c1edf7bb9aff472864d6..2615a1f4c14cb7134fb100977f478be3b4bd7b29 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -373,6 +373,31 @@ to enable DNSSEC. Must be one of:
 The default keysize for the KSK generated with :doc:`pdnsutil secure-zone <dnssec/pdnsutil>`.
 Only relevant for algorithms with non-fixed keysizes (like RSA).
 
+.. _setting-default-publish-cdnskey:
+
+``default-publish-cdnskey``
+---------------------------
+- Integer
+- Default: empty
+
+.. versionadded:: 4.3.0
+
+The default PUBLISH-CDNSKEY value for zones that do not have one individually specified.
+See the :ref:`metadata-publish-cdnskey-publish-cds` docs for more information.
+
+.. _setting-default-publish-cds:
+
+``default-publish-cds``
+-----------------------
+
+- Comma-separated integers
+- Default: empty
+
+.. versionadded:: 4.3.0
+
+The default PUBLISH-CDS value for zones that do not have one individually specified.
+See the :ref:`metadata-publish-cdnskey-publish-cds` docs for more information.
+
 .. _setting-default-soa-edit:
 
 ``default-soa-edit``
@@ -744,11 +769,16 @@ available in non-static distributions.
 
 ``local-address``
 -----------------
+.. versionchanged:: 4.3.0
+  now also takes your IPv6 addresses
+
+.. versionchanged:: 4.3.0
+  Before 4.3.0, this setting only supported IPv4.
 
 -  IPv4 Addresses, separated by commas or whitespace
--  Default: 0.0.0.0
+-  Default: 0.0.0.0, ``::``
 
-Local IP address to which we bind. It is highly advised to bind to
+Local IP addresses to which we bind. It is highly advised to bind to
 specific interfaces and not use the default 'bind to any'. This causes
 big problems if you have multiple IP addresses. Unix does not provide a
 way of figuring out what IP address a packet was sent to when binding to
@@ -769,6 +799,11 @@ Fail to start if one or more of the
 
 ``local-ipv6``
 --------------
+.. versionchanged:: 4.3.0
+  removed, use :ref:`setting-local-address`
+
+.. deprecated:: 4.3.0
+  This setting has been removed, use :ref:`setting-localaddress`
 
 -  IPv6 Addresses, separated by commas or whitespace
 -  Default: '::'
@@ -782,6 +817,9 @@ big problems if you have multiple IP addresses.
 ``local-ipv6-nonexist-fail``
 ----------------------------
 
+.. deprecated:: 4.3.0
+  This setting has been removed, use :ref:`setting-localaddress-nonexist-fail`
+
 -  Boolean
 -  Default: no
 
@@ -868,6 +906,32 @@ e.g. error = 3, warning = 4, notice = 5, info = 6
 
 Script to be used to edit incoming AXFRs, see :ref:`modes-of-operation-axfrfilter`
 
+.. _setting-lua-health-checks-expire-delay:
+
+``lua-health-checks-expire-delay``
+----------------------------------
+
+-  Integer
+-  Default: 3600
+
+.. versionadded:: 4.3.0
+
+Amount of time (in seconds) to expire (remove) a LUA monitoring check when the record
+isn't used any more (either deleted or modified).
+
+.. _setting-lua-health-checks-interval:
+
+``lua-health-checks-interval``
+------------------------------
+
+-  Integer
+-  Default: 5
+
+.. versionadded:: 4.3.0
+
+Amount of time (in seconds) between subsequent monitoring health checks. Does nothing
+if the checks take more than that time to execute.
+
 .. _setting-lua-prequery-script:
 
 ``lua-prequery-script``