From: Otto Moerbeek Date: Tue, 21 Jan 2025 15:36:37 +0000 (+0100) Subject: rec: document that forwarding catalog zones cannot be combined with Lua config. X-Git-Tag: dnsdist-2.0.0-alpha1~149^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3beaca5d163092c8a3f04982519dfadcbd18d0bc;p=thirdparty%2Fpdns.git rec: document that forwarding catalog zones cannot be combined with Lua config. Fixes #15052 --- diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/settings/docs-new-preamble-in.rst index 8eed3fe3fd..1881cbe6a9 100644 --- a/pdns/recursordist/settings/docs-new-preamble-in.rst +++ b/pdns/recursordist/settings/docs-new-preamble-in.rst @@ -501,6 +501,9 @@ As of version 5.2.0, a forwarding catalog zone entry is defined as: recurse: bool, default false notify_allowed: bool, default false +While this setting has no equivalent old-style Lua configuration, it cannot appear together with :ref:`setting-lua-config-file` being set. +If you want to use catalog zones to define forwards, you need to convert existing Lua configuration to YAML format. + Names instead of IP addresess can be used for ``addresses`` if :ref:`setting-yaml-recursor.system_resolver_ttl` is set. An example of a :ref:`setting-yaml-recursor.forwarding_catalog_zones` entry, which is a sequence of `ForwardingCatalogZone`_: diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py index 43cc59ad85..a6f3269b50 100644 --- a/pdns/recursordist/settings/table.py +++ b/pdns/recursordist/settings/table.py @@ -3577,7 +3577,7 @@ Load this Lua script on startup and shutdown and run the Lua function ``on_recur 'default' : '', 'help' : 'Sequence of ForwardingCatalogZone', 'doc' : ''' -Sequence of ForwardingCatalogZone +Sequence of ForwardingCatalogZone. This setting cannot be combined with :ref:`setting-lua-config-file`. ''', 'skip-old' : 'No equivalent old style setting', 'versionadded': '5.2.0',