diff --git a/templates/db.reverse.j2 b/templates/db.reverse.j2 index 129fe732e6ae00a731764c745e11fb34f858d46b..fde5f826c6a8b652db33470c8a3b50b3bfb076f5 100644 --- a/templates/db.reverse.j2 +++ b/templates/db.reverse.j2 @@ -49,9 +49,9 @@ $TTL {{ dns_minimum_ttl }} {% if dns_hostsfiles is defined %} {% for netclassname, netclass in network.classes.items() if netclassname in dns_hostsfiles %} {% for l in lookup('url', 'file:%s' | format(dns_hostsfiles[netclassname]), wantlist=True) if (l | length) > 0 and l[0] != "#" %} -{% set ip = l | cut %} +{% set ip = l | sdm.common.cut %} {% if ip not in mgntips and (ip | regex_search('^%s' | format(_rzone))) == _rzone %} -{% set hst = l | cut(field=2) %} +{% set hst = l | sdm.common.cut(field=2) %} {{ ip | regex_replace('^%s.' | format(_rzone), '' ) | sdm.common.split('\\.') | reverse | join('.') }} {{ dns_minimum_ttl }} IN PTR {{ '%s%s.%s' | format(hst, netclass.dns.hostnamepostfix | default(""), netclass.dns.domain) }}. {% endif %} {% endfor %} diff --git a/templates/db.zone.j2 b/templates/db.zone.j2 index 6bc583d357d6c7df87d90fccbfde560f034f1d5c..e91c92943033e98f2bda93e8b1a1af3ff05c3ead 100644 --- a/templates/db.zone.j2 +++ b/templates/db.zone.j2 @@ -86,13 +86,13 @@ $TTL {{ dns_minimum_ttl }} {% if dns_hostsfiles is defined %} {% for netclassname, netclass in network.classes.items() if netclassname in dns_hostsfiles and netclass.dns.domain ==_domain %} {% for l in lookup('url', 'file:%s' | format(dns_hostsfiles[netclassname]), wantlist=True) if (l | length) > 0 and l[0] != "#" %} -{% set ip = l | cut %} +{% set ip = l | sdm.common.cut %} {% if ip not in mgntips %} -{% set hstnm = l | cut(field=2) %} +{% set hstnm = l | sdm.common.cut(field=2) %} {% do hosts.append(hstnm) %} {{ outputDNSHostEntry(hstnm, ip, 0, dns_minimum_ttl) }} {% for f in range(3, (l | regex_replace('#.*$', '') | sdm.common.split | length) + 1) %} -{% set alias = l | cut(field=f) %} +{% set alias = l | sdm.common.cut(field=f) %} {{ outputDNSAliasEntry(hstnm, alias, dns_minimum_ttl) }} {% do hosts.append(alias) %} {% endfor %}