From: Remi Gacogne Date: Mon, 6 Jul 2026 09:19:11 +0000 (+0200) Subject: dnsdist: Fix brain farts spotted by Miod (thanks!) X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea5ae462942757bcd5edabbfb02f4485660ccd80;p=thirdparty%2Fpdns.git dnsdist: Fix brain farts spotted by Miod (thanks!) Signed-off-by: Remi Gacogne --- diff --git a/pdns/dnsdistdist/docs/running.rst b/pdns/dnsdistdist/docs/running.rst index 6eaceb92ce..e1caca9173 100644 --- a/pdns/dnsdistdist/docs/running.rst +++ b/pdns/dnsdistdist/docs/running.rst @@ -5,7 +5,7 @@ dnsdist is meant to run as a daemon. As such, distribution native packages know how to stop/start themselves using operating system services. It is configured with a configuration file called ``dnsdist.yml``. If that file does not exist, :program:`dnsdist` will attempt to fall back to a ``dnsdist.conf`` file, expecting a configuration in ``Lua`` instead of ``YAML``. -The default path to this file is determined by the ``SYSCONFDIR`` variable during compilation. +The default path to these files is determined by the ``SYSCONFDIR`` variable during compilation. Most likely this path is ``/etc/dnsdist``, ``/etc`` or ``/usr/local/etc/``, dnsdist will tell you on startup which file it reads. dnsdist is designed to (re)start almost instantly. diff --git a/pdns/dnsdistdist/docs/upgrade_guide.rst b/pdns/dnsdistdist/docs/upgrade_guide.rst index 3520209327..e551f21b1c 100644 --- a/pdns/dnsdistdist/docs/upgrade_guide.rst +++ b/pdns/dnsdistdist/docs/upgrade_guide.rst @@ -43,7 +43,7 @@ Structured logging is now enabled by default, and can be disabled via :func:`set :program:`dnsdist` now looks by default for a configuration file named ``dnsdist.yml`` in the system configuration directory (determined by the ``SYSCONFDIR`` variable during compilation), instead of ``dnsdist.conf``. If ``dnsdist.yml`` does not exist, it will automatically fall back to ``dnsdist.conf``. That means that if you are upgrading an existing setup using the ``Lua`` configuration format in a ``dnsdist.conf`` file, you should not have to edit your configuration as long as you don't have a ``dnsdist.yml`` file in the system configuration directory. -Please be aware that after loading a ``dnsdist.yml`` file, :program:`dnsdist` which check whether a file named ``dnsdist.lua`` is present in the system configuration directory, and if so that file will also be loaded but without the ability to use configuration directives. Please see :doc:`the YAML settings reference ` for more information. +Please be aware that after loading a ``dnsdist.yml`` file, :program:`dnsdist` will check whether a file named ``dnsdist.lua`` is present in the system configuration directory, and if so that file will also be loaded but without the ability to use configuration directives. Please see :doc:`the YAML settings reference ` for more information. The webserver no longer allows cross-origin HTTP requests by default, please have a look at ``webserver.allow_cross_origin_requests`` (:func:`setWebserverConfig`'s ``allowCrossOriginRequests`` for Lua-based configurations) if your setup requires them.