From: Otto Moerbeek Date: Fri, 7 Jun 2024 08:01:17 +0000 (+0200) Subject: Document the new approach of reading YAML from a recursor.conf file X-Git-Tag: rec-5.2.0-alpha0~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c7da31c0c5367553f5ae285a1bb9f050672d425;p=thirdparty%2Fpdns.git Document the new approach of reading YAML from a recursor.conf file --- diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/settings/docs-new-preamble-in.rst index 6aaba02b3a..ffee47e6d4 100644 --- a/pdns/recursordist/settings/docs-new-preamble-in.rst +++ b/pdns/recursordist/settings/docs-new-preamble-in.rst @@ -10,12 +10,13 @@ Settings on the command line are processed after the file-based settings are pro If both ``recursor.conf`` and ``recursor.yml`` files are found in the configuration directory the YAML file is used. A configuration using the old style syntax can be converted to a YAML configuration using the instructions in :doc:`appendices/yamlconversion`. - Release 5.0.0 will install a default old-style ``recursor.conf`` files only. + Release 5.0.0 will install a default old-style ``recursor.conf`` file. - With the release of version 5.1.0, packages will stop installing a default ``recursor.conf`` and start installing a default ``recursor.yml`` file if no existing ``recursor.conf`` is present. - In the absense of a ``recursor.yml`` file, an existing ``recursor.conf`` file will be accepted and used. + Starting with version 5.1.0, in the absense of a ``recursor.yml`` file, an existing ``recursor.conf`` will be processed as YAML, + if that fails, it will be processed as old-style configuration. + Packages will stop installing a old-style ``recursor.conf`` file and start installing a default ``recursor.conf`` file containing YAML syntax. - With the release of 5.2.0, the default will be to expect a ``recursor.yml`` file and reading of ``recursor.conf`` files will have to be enabled specifically by providing a command line option. + With the release of 5.2.0, the default will be to expect a YAML configuation file and reading of old-style ``recursor.conf`` files will have to be enabled specifically by providing a command line option. In a future release support for the "old-style" ``recursor.conf`` settings file will be dropped.