Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rec: document that forwarding catalog zones cannot be combined with Lua config. #15074

Merged
merged 1 commit into from
Jan 22, 2025
Merged

rec: document that forwarding catalog zones cannot be combined with Lua config. #15074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pdns/recursordist/settings/docs-new-preamble-in.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`_:

Expand Down
2 changes: 1 addition & 1 deletion pdns/recursordist/settings/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3577,7 +3577,7 @@
'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',
Expand Down
Loading