From bc3700f87912cfb5e43587e12b5c9f1d9d72c16f Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Sat, 16 Sep 2023 15:57:27 +0200 Subject: [PATCH] Improve config-dir docs a bit --- pdns/recursordist/docs/settings.rst | 3 ++- pdns/recursordist/docs/yamlsettings.rst | 3 ++- pdns/recursordist/settings/table.py | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst index 89c14d3d46..ba9e877f1b 100644 --- a/pdns/recursordist/docs/settings.rst +++ b/pdns/recursordist/docs/settings.rst @@ -367,8 +367,9 @@ Time to wait for data from TCP clients. - YAML setting: :ref:`setting-yaml-recursor.config_dir` -Location of configuration directory (``recursor.conf``). +Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored). Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time. +Use default or set on command line. .. _setting-config-name: diff --git a/pdns/recursordist/docs/yamlsettings.rst b/pdns/recursordist/docs/yamlsettings.rst index 5e9baea439..cec4d93b08 100644 --- a/pdns/recursordist/docs/yamlsettings.rst +++ b/pdns/recursordist/docs/yamlsettings.rst @@ -2034,8 +2034,9 @@ Either do not ``chroot`` on these systems or set the 'Type' of this service to ' - Old style setting: :ref:`setting-config-dir` -Location of configuration directory (``recursor.conf``). +Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored). Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time. +Use default or set on command line. .. _setting-yaml-recursor.config_name: diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py index 02dd1ab928..6178aac50f 100644 --- a/pdns/recursordist/settings/table.py +++ b/pdns/recursordist/settings/table.py @@ -380,10 +380,11 @@ EMPTY? ''' 'section' : 'recursor', 'type' : LType.String, 'default' : 'SYSCONFDIR', - 'help' : 'Location of configuration directory (recursor.conf)', + 'help' : 'Location of configuration directory (recursor.conf or recursor.yml)', 'doc' : ''' -Location of configuration directory (``recursor.conf``). +Location of configuration directory (where ``recursor.conf`` or ``recursor.yml`` is stored). Usually ``/etc/powerdns``, but this depends on ``SYSCONFDIR`` during compile-time. +Use default or set on command line. ''', }, { -- 2.47.2