From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 3 Dec 2025 11:15:38 +0000 (+0100)
Subject: /fallback: apply during reload (force kresd restarts)
X-Git-Tag: v6.1.0~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc413321f1fb15dd813c03f5c333b3e77e9ab0b2;p=thirdparty%2Fknot-resolver.git

/fallback: apply during reload (force kresd restarts)
---

diff --git a/NEWS b/NEWS
index f9e88e529..bf41d5030 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Knot Resolver 6.0.18 (2026-mm-dd)
+=================================
+
+Bugfixes
+--------
+- reload did not apply changes to /fallback (!1763)
+
+
 Knot Resolver 6.0.17 (2025-12-02)
 =================================
 
diff --git a/python/knot_resolver/datamodel/config_schema.py b/python/knot_resolver/datamodel/config_schema.py
index add8aba83..8770aa6fa 100644
--- a/python/knot_resolver/datamodel/config_schema.py
+++ b/python/knot_resolver/datamodel/config_schema.py
@@ -135,6 +135,7 @@ class KresConfig(ConfigSchema):
 
     _LAYER = Raw
 
+    #### When ADDING options, please also update config_nodes() in ../manager/manager.py
     nsid: Optional[EscapedStr]
     hostname: EscapedStr
     rundir: WritableDir
diff --git a/python/knot_resolver/datamodel/templates/kresd.lua.j2 b/python/knot_resolver/datamodel/templates/kresd.lua.j2
index 14b862913..ee010d225 100644
--- a/python/knot_resolver/datamodel/templates/kresd.lua.j2
+++ b/python/knot_resolver/datamodel/templates/kresd.lua.j2
@@ -31,7 +31,7 @@ nsid.name('{{ cfg.nsid }}' .. worker.id)
 -- DNSSEC section -----------------------------------
 {% include "dnssec.lua.j2" %}
 
--- FORWARD section ----------------------------------
+-- FORWARD and FALLBACK section ----------------------------------
 {% include "forward.lua.j2" %}
 
 -- CACHE section ------------------------------------
diff --git a/python/knot_resolver/manager/manager.py b/python/knot_resolver/manager/manager.py
index f26e1a4bb..d3805e72e 100644
--- a/python/knot_resolver/manager/manager.py
+++ b/python/knot_resolver/manager/manager.py
@@ -119,18 +119,23 @@ class KresManager:  # pylint: disable=too-many-instance-attributes
             return [
                 config.nsid,
                 config.hostname,
+                # config.rundir not allowed to change
                 config.workers,
+                # config.management not allowed to change and not affecting workers anyway
                 config.options,
                 config.network,
+                # config.views fully handled by policy-loader
+                # config.local_data fully handled by policy-loader
                 config.forward,
+                config.fallback,
                 config.cache,
                 config.dnssec,
                 config.dns64,
                 config.logging,
                 config.monitoring,
-                config.lua,
                 config.rate_limiting,
                 config.defer,
+                config.lua,
             ]
 
         # register and immediately call a verifier that validates config with 'canary' kresd process