From 84cb31dac0e381be333ec07af5d3dbdae2116466 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Aug 2023 09:38:01 +0200 Subject: [PATCH] datamodel: /local-data: refactor ttl --- .../templates/macros/local_data_macros.lua.j2 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 index 5fce85fa5..215b175bb 100644 --- a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 +++ b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 @@ -17,6 +17,13 @@ hints.root_file('{{ file }}') {% endfor %} {%- endmacro %} +{%- macro local_data_ttl(ttl) -%} +{%- if ttl -%} +{{ ttl.seconds() }} +{%- else -%} +{{ 'C.KR_RULE_TTL_DEFAULT' }} +{%- endif -%} +{%- endmacro -%} {% macro local_data_addresses(pairs) -%} {%- for name, addresses in pairs.items() -%} @@ -36,9 +43,7 @@ assert(hints.add_hosts('{{ file }}').result == true) {% macro local_data_records(input_str, is_rpz, ttl, nodata, tags=none, id='rrs') -%} {{ id }} = ffi.new('struct kr_rule_zonefile_config') -{% if ttl %} -{{ id }}.ttl = {{ ttl.seconds() }} -{% endif %} +{{ id }}.ttl = {{ local_data_ttl(ttl) }} {% if tags %} {{ id }}.tags = {{ policy_get_tagset(tags) }} {% endif %} @@ -55,16 +60,11 @@ assert(C.kr_rule_zonefile({{ id }})==0) {%- endmacro %} {% macro local_data_subtree_root(root, type, ttl, tags) -%} -{% if ttl %} -{%- set get_ttl = ttl.seconds() -%} -{%- else -%} -{%- set get_ttl = 'C.KR_RULE_TTL_DEFAULT' -%} -{% endif %} {%- if tags -%} {%- set get_tags = policy_get_tagset(tags) -%} {%- else -%} {%- set get_tags = '0' -%} {%- endif -%} assert(C.kr_rule_local_subtree(todname('{{ root }}'), - C.KR_RULE_SUB_{{ type.upper() }}, {{ get_ttl }}, {{ get_tags }}) == 0) + C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ get_tags }}) == 0) {%- endmacro %} -- 2.47.2