From: Otto Moerbeek Date: Wed, 23 Mar 2022 08:55:53 +0000 (+0100) Subject: Note that api-config-dir and include-dir should be the same for dynamic updates of... X-Git-Tag: rec-4.7.0-beta1~43^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11442%2Fhead;p=thirdparty%2Fpdns.git Note that api-config-dir and include-dir should be the same for dynamic updates of config to work. Plus fix assorted typos. Fixes #11439 --- diff --git a/pdns/recursordist/docs/http-api/endpoint-servers-config.rst b/pdns/recursordist/docs/http-api/endpoint-servers-config.rst index 713402d577..0d96dbd9e8 100644 --- a/pdns/recursordist/docs/http-api/endpoint-servers-config.rst +++ b/pdns/recursordist/docs/http-api/endpoint-servers-config.rst @@ -7,6 +7,9 @@ .. note:: Only :ref:`setting-allow-from` and :ref:`setting-allow-notify-from` can be set. + .. note:: + For configuration changes to work :ref:`setting-include-dir` and :ref:`setting-api-config-dir` should have the same value. + :param server_id: The name of the server :param config_setting_name: The name of the setting to change diff --git a/pdns/recursordist/docs/lua-config/proxymapping.rst b/pdns/recursordist/docs/lua-config/proxymapping.rst index 888494633f..bd12475ee0 100644 --- a/pdns/recursordist/docs/lua-config/proxymapping.rst +++ b/pdns/recursordist/docs/lua-config/proxymapping.rst @@ -37,7 +37,7 @@ The following function is available to configure table based proxy mapping. Reloading the Lua configuration will replace the current configuration with the new one. If the subnets specified in multiple :func:`addProxyMapping` calls overlap, the most specific one is used. By default, the address *before* mapping ``S`` is used for internal logging and ``Protobuf`` messages. -See :func:`protobufServer` on how to tune the source address logged in ``Protobuf` messages. +See :func:`protobufServer` on how to tune the source address logged in ``Protobuf`` messages. .. function:: addProxyMapping(subnet, ip) diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst index b0ce7271e0..5c54e02098 100644 --- a/pdns/recursordist/docs/settings.rst +++ b/pdns/recursordist/docs/settings.rst @@ -154,6 +154,7 @@ Allow ``trustanchor.server CH TXT`` and ``negativetrustanchor.server CH TXT`` qu - Default: unset Directory where the REST API stores its configuration and zones. +For configuration updates to work, :ref:`setting-include-dir` should have the same value. .. _setting-api-key: diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst index 17fc67694b..281efe35e4 100644 --- a/pdns/recursordist/docs/upgrade.rst +++ b/pdns/recursordist/docs/upgrade.rst @@ -20,7 +20,7 @@ This has the consequence that authoritative nameservers will be contacted over I New settings ^^^^^^^^^^^^ -- The :ref:`settings-save-parent-ns-set` setting has been introduced, enabling fallback cases if the parent ``NS`` set contains names not in the child ``NS`` set. +- The :ref:`setting-save-parent-ns-set` setting has been introduced, enabling fallback cases if the parent ``NS`` set contains names not in the child ``NS`` set. Deprecated and changed settings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^