From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 18 Feb 2025 14:09:45 +0000 (+0100)
Subject: datamodel: cache: prefill: fix ca-file template
X-Git-Tag: v6.0.11~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ca5f243899688319773772d089fbd3118546857;p=thirdparty%2Fknot-resolver.git

datamodel: cache: prefill: fix ca-file template

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

diff --git a/NEWS b/NEWS
index 73c80456d..8f4de84b7 100644
--- 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 f0176a59f..b37186005 100644
--- 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 %}
 })