From: Aleš <ales.mrazek@nic.cz>
Date: Tue, 14 Dec 2021 16:15:40 +0000 (+0100)
Subject: datamodel: templates: refactoring, new macros
X-Git-Tag: v6.0.0a1~69^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af94f03a7555f2c35efb2d762e04eb3153c44f9;p=thirdparty%2Fknot-resolver.git

datamodel: templates: refactoring, new macros
---

diff --git a/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2
index b5e774f60..d4fdf28fc 100644
--- a/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2
@@ -3,5 +3,5 @@
 modules.load('dns64')
 
 -- dns64.prefix
-dns64.config('{{ cfg.dns64.prefix.to_std().network_address }}')
+dns64.config('{{ cfg.dns64.prefix.to_std().network_address|string }}')
 {% endif %}
\ No newline at end of file
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
new file mode 100644
index 000000000..390241926
--- /dev/null
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
@@ -0,0 +1,3 @@
+{% macro net_listen(interface) -%}
+net.listen('{{ interface.listen.ip|string }}', {{ interface.listen.port|int }}, { kind='{{ 'tls' if interface.kind == 'dot' else interface.kind }}', freebind={{ 'true' if interface.freebind else 'false'}} })
+{%- endmacro %}
\ No newline at end of file
diff --git a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
index a9fc79dfc..9bfd0dfd5 100644
--- a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
@@ -1,3 +1,5 @@
+{% from 'macros/network_macros.lua.j2' import net_listen %}
+
 -- network.do-ipv4/6
 net.ipv4 = {{ 'true' if cfg.network.do_ipv4 else 'false' }}
 net.ipv6 = {{ 'true' if cfg.network.do_ipv6 else 'false' }}
@@ -64,9 +66,6 @@ renumber.config = {
 {% endif %}
 
 -- network.interfaces
-{% for item in cfg.network.interfaces %}
-net.listen('{{ item.listen.ip }}', {{ item.listen.port }}, {
-    kind = '{{ item.kind if item.kind != 'dot' else 'tls' }}',
-    freebind = {{ 'true' if item.freebind else 'false'}}
-})
+{% for interface in cfg.network.interfaces %}
+{{ net_listen(interface) }}
 {% endfor %}
\ No newline at end of file