/fallback: apply during reload (force kresd restarts)

diff --git a/NEWS b/NEWS
index f9e88e52913ba40346cd71e29d42b9742439462a..bf41d5030451bef808ecdb6f7901ebffb2eb26ac 100644 (file)
--- 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 add8aba83dfec256fa2dbd95fd9bc643474f1412..8770aa6fa616e1862a10a887b4b7a61930c6c94e 100644 (file)
--- 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 14b862913e756bc9506d614cf7ebabdc32faff52..ee010d225fc673130bf5c06dfbc8515c6549182f 100644 (file)
--- 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 f26e1a4bb394b5bcc3e521d5ea926543e3b7d85d..d3805e72e696fa2c6fa48b257382462a18282507 100644 (file)
--- 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