manager: datamodel: templates: render punycode for domains

diff --git a/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2
index 2391b1e7150a9a51a52cb83d7a9597ec44c9777a..3571577187d25d5caab62e38c44cb256807d3dca 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2
@@ -8,7 +8,7 @@ cache.ns_tout({{ cfg.cache.ns_timeout.millis() }})
 modules.load('prefill')
 prefill.config({
 {% for item in cfg.cache.prefill %}
-    ['{{ item.domain }}'] = {
+    ['{{ item.origin.punycode() }}'] = {
         url = '{{ item.url }}',
         interval = {{ item.refresh_interval.seconds() }}
         {{ "ca_file = '"+item.ca_file+"'," if item.ca_file }}

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
index bf8090ae568ef5e75bdf8200f58d145d23be1a5b..f3ba8b79d66da0804dacb791920de4e681c5736a 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
@@ -235,10 +235,10 @@ policy.TLS_FORWARD({{ tls_servers_table(servers) }})
 {% macro policy_todname(names) -%}
 policy.todnames({
 {%- if names is string -%}
-'{{ names|string }}'
+'{{ names.punycode()|string }}'
 {%- else -%}
 {%- for name in names -%}
-'{{ name|string }}',
+'{{ name.punycode()|string }}',
 {%- endfor -%}
 {%- endif -%}
 })

diff --git a/manager/knot_resolver_manager/datamodel/templates/server.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/server.lua.j2
index 37fdd7dc6fb65cad8155fe9cd8b2a96fcf5f266a..3126137da064972a48ae6c8ab13c6b57d74d8340 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/server.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/server.lua.j2
@@ -11,7 +11,7 @@ nsid.name('{{ cfg.server.nsid }}_' .. worker.id)
 -- server.watchdog
 modules.load('watchdog')
 {% if cfg.server.watchdog.qname and cfg.server.watchdog.qtype -%}
-watchdog.config({ qname = '{{ cfg.server.watchdog.qname }}', qtype = kres.type.{{ cfg.server.watchdog.qtype }} })
+watchdog.config({ qname = '{{ cfg.server.watchdog.qname.punycode() }}', qtype = kres.type.{{ cfg.server.watchdog.qtype }} })
 {%- endif %}
 {% else %}
 modules.unload('watchdog')

diff --git a/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
index d3d1c61eb561766b5c2313776cd430391033ef8b..130facf9a31de84f38bdfc16b82565161ba2353f 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
@@ -30,7 +30,7 @@ hints.add_hosts('{{ item }}')
 -- static-hints.root-hints
 hints.root({
 {% for name, addrs in cfg.static_hints.root_hints.items() %}
-['{{ name }}'] = {
+['{{ name.punycode() }}'] = {
 {% for addr in addrs %}
         '{{ addr }}',
 {% endfor %}
@@ -43,7 +43,7 @@ hints.root({
 -- static-hints.hints
 {% for name, addrs in cfg.static_hints.hints.items() %}
 {% for addr in addrs %}
-hints.set('{{ name }} {{ addr }}')
+hints.set('{{ name.punycode() }} {{ addr }}')
 {% endfor %}
 {% endfor %}
 {% endif %}