From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Wed, 3 May 2023 10:30:45 +0000 (+0200)
Subject: manager: datamodel: use 'boolean' macro in datamodel
X-Git-Tag: v6.0.1~11^2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64925df583352c86c77cf5a90ff6cdb4597cb564;p=thirdparty%2Fknot-resolver.git

manager: datamodel: use 'boolean' macro in datamodel
---

diff --git a/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
index b26961bbe..31a29beac 100644
--- a/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
@@ -1,3 +1,5 @@
+{% from 'macros/common_macros.lua.j2' import boolean %}
+
 {% if not cfg.dnssec %}
 -- disable dnssec
 trust_anchors.remove('.')
@@ -51,6 +53,6 @@ trust_anchors.set_insecure({
 {% if cfg.dnssec.trust_anchors_files %}
 -- dnssec.trust-anchors-files
 {% for taf in cfg.dnssec.trust_anchors_files %}
-trust_anchors.add_file('{{ taf.file }}',  readonly = {{ 'true' if taf.read_only else 'false' }})
+trust_anchors.add_file('{{ taf.file }}',  readonly = {{ boolean(taf.read_only) }})
 {% endfor %}
 {% endif %}
\ No newline at end of file
diff --git a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
index d7fb845d5..2fb398e97 100644
--- a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
@@ -1,3 +1,5 @@
+{% from 'macros/common_macros.lua.j2' import boolean %}
+
 -- logging.level
 log_level('{{ cfg.logging.level }}')
 
@@ -27,15 +29,15 @@ modules.load('dnstap')
 dnstap.config({
     socket_path = '{{ cfg.logging.dnstap.unix_socket }}',
     client = {
-        log_queries = {{ 'true' if cfg.logging.dnstap.log_queries else 'false' }},
-        log_responses = {{ 'true' if cfg.logging.dnstap.log_responses else 'false' }},
-        log_tcp_rtt = {{ 'true' if cfg.logging.dnstap.log_tcp_rtt else 'false' }}
+        log_queries = {{ boolean(cfg.logging.dnstap.log_queries) }},
+        log_responses = {{ boolean(cfg.logging.dnstap.log_responses) }},
+        log_tcp_rtt = {{ boolean(cfg.logging.dnstap.log_tcp_rtt) }}
     }
 })
 {%- endif %}
 
 -- logging.debugging.assertion-abort
-debugging.assertion_abort = {{ 'true' if cfg.logging.debugging.assertion_abort else 'false' }}
+debugging.assertion_abort = {{ boolean(cfg.logging.debugging.assertion_abort) }}
 
 -- logging.debugging.assertion-fork
 debugging.assertion_fork = {{ cfg.logging.debugging.assertion_fork.millis() }}
diff --git a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
index 60b09652c..665ee4543 100644
--- a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
@@ -1,8 +1,9 @@
+{% from 'macros/common_macros.lua.j2' import boolean %}
 {% from 'macros/network_macros.lua.j2' import network_listen, http_config %}
 
 -- network.do-ipv4/6
-net.ipv4 = {{ 'true' if cfg.network.do_ipv4 else 'false' }}
-net.ipv6 = {{ 'true' if cfg.network.do_ipv6 else 'false' }}
+net.ipv4 = {{ boolean(cfg.network.do_ipv4) }}
+net.ipv6 = {{ boolean(cfg.network.do_ipv6) }}
 
 {% if cfg.network.out_interface_v4 %}
 -- network.out-interface-v4
diff --git a/manager/knot_resolver_manager/datamodel/templates/options.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/options.lua.j2
index 513f1e266..8210fb6d8 100644
--- a/manager/knot_resolver_manager/datamodel/templates/options.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/options.lua.j2
@@ -1,3 +1,5 @@
+{% from 'macros/common_macros.lua.j2' import boolean %}
+
 -- options.glue-checking
 mode('{{ cfg.options.glue_checking }}')
 
@@ -38,13 +40,13 @@ modules.unload('refuse_nord')
 {% endif %}
 
 -- options.qname-minimisation
-option('NO_MINIMIZE', {{ 'false' if cfg.options.minimize else 'true' }})
+option('NO_MINIMIZE', {{ boolean(cfg.options.minimize,true) }})
 
 -- options.query-loopback
-option('ALLOW_LOCAL', {{ 'true' if cfg.options.query_loopback else 'false' }})
+option('ALLOW_LOCAL', {{ boolean(cfg.options.query_loopback) }})
 
 -- options.reorder-rrset
-option('REORDER_RR', {{ 'true' if cfg.options.reorder_rrset else 'false' }})
+option('REORDER_RR', {{ boolean(cfg.options.reorder_rrset) }})
 
 -- options.query-case-randomization
-option('NO_0X20', {{ 'false' if cfg.options.query_case_randomization else 'true' }})
\ No newline at end of file
+option('NO_0X20', {{ boolean(cfg.options.query_case_randomization,true) }})
\ No newline at end of file
diff --git a/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
index 1dd0098cc..938ea8da5 100644
--- a/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
@@ -1,7 +1,9 @@
+{% from 'macros/common_macros.lua.j2' import boolean %}
+
 {% if cfg.webmgmt -%}
 -- webmgmt
 modules.load('http')
-http.config({tls = {{ 'true' if cfg.webmgmt.tls else 'false'}},
+http.config({tls = {{ boolean(cfg.webmgmt.tls) }},
 {%- if cfg.webmgmt.cert_file -%}
     cert = '{{ cfg.webmgmt.cert_file }}',
 {%- endif -%}