datamodel: cache: prefill: fix ca-file template

> TypeError: can only concatenate str (not "ReadableFile") to str

diff --git a/NEWS b/NEWS
index 73c80456dde7aa87bc1aeccb8156ab5a0bb2e118..8f4de84b76794c4584d71f1fce828c8cbc3b9821 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Bugfixes
 - manager: avoid an uncommon startup race in policy-loader (!1653)
   [WARN] exited: policy-loader (exit status 0; not expected)
 - manager: fix processes watchdog errors during shutdown (!1651)
+- /cache/prefill/*/ca_file: fix setting this attribute (!1655)
 
 
 Knot Resolver 6.0.10 (2025-01-20)

diff --git a/python/knot_resolver/datamodel/templates/cache.lua.j2 b/python/knot_resolver/datamodel/templates/cache.lua.j2
index f0176a59f9fa00ee2ce197fd8cfe459e38a34e15..b37186005830abbfe5d76ed0f69a0558de7fe73e 100644 (file)
--- a/python/knot_resolver/datamodel/templates/cache.lua.j2
+++ b/python/knot_resolver/datamodel/templates/cache.lua.j2
@@ -10,8 +10,8 @@ prefill.config({
 {% for item in cfg.cache.prefill %}
     ['{{ item.origin.punycode() }}'] = {
         url = '{{ item.url }}',
-        interval = {{ item.refresh_interval.seconds() }}
-        {{ "ca_file = '"+item.ca_file+"'," if item.ca_file }}
+        interval = {{ item.refresh_interval.seconds() }},
+        {{ "ca_file = '" + item.ca_file|string + "'," if item.ca_file }}
     }
 {% endfor %}
 })