diff options
| -rw-r--r-- | data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl | 34 | ||||
| -rw-r--r-- | data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl | 28 | ||||
| -rwxr-xr-x | src/conf_mode/dns_forwarding.py | 4 |
3 files changed, 33 insertions, 33 deletions
diff --git a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl index de5eaee00..e62b9bb81 100644 --- a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl +++ b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl @@ -3,26 +3,26 @@ # dot zone (catch-all): '+' indicates recursion is desired # (same as forward-zones-recurse) -{#- the code below ensures the order of nameservers is determined first by #} -{#- the order of tags, then by the order of nameservers within that tag #} -{%- set n = namespace(dot_zone_ns='') %} -{%- for tag in name_server_tags_recursor %} -{%- set ns = '' %} -{%- if tag in name_servers %} -{%- set ns = ns + name_servers[tag]|join(', ') %} -{%- set n.dot_zone_ns = (n.dot_zone_ns, ns)|join(', ') if n.dot_zone_ns != '' else ns %} -{%- endif %} +{# the code below ensures the order of nameservers is determined first by #} +{# the order of tags, then by the order of nameservers within that tag #} +{% set n = namespace(dot_zone_ns='') %} +{% for tag in name_server_tags_recursor %} +{% set ns = '' %} +{% if tag in name_servers %} +{% set ns = ns + name_servers[tag]|join(', ') %} +{% set n.dot_zone_ns = (n.dot_zone_ns, ns)|join(', ') if n.dot_zone_ns != '' else ns %} +{% endif %} # {{ tag }}: {{ ns }} -{%- endfor %} +{% endfor %} -{%- if n.dot_zone_ns %} +{% if n.dot_zone_ns %} +.={{ n.dot_zone_ns }} -{%- endif %} +{% endif %} -{% if forward_zones -%} +{% if forward_zones %} # zones added via 'service dns forwarding domain' -{%- for zone, zonedata in forward_zones.items() %} -{% if zonedata['recursion-desired'] %}+{% endif %}{{ zone }}={{ zonedata['nslist']|join(', ') }} -{%- endfor %} -{%- endif %} +{% for zone, zonedata in forward_zones.items() %} +{% if zonedata['recursion-desired'] %}+{% endif %}{{ zone }}={{ zonedata['nslist']|join(', ') }} +{% endfor %} +{% endif %} diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl index b0d99d9ae..8fefae0b2 100644 --- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl +++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl @@ -1,24 +1,24 @@ -- Autogenerated by VyOS (vyos-hostsd) -- -- Do not edit, your changes will get overwritten -- -{% if hosts -%} +{% if hosts %} -- from 'system static-host-mapping' and DHCP server -{%- for tag, taghosts in hosts.items() %} -{%- for host, hostprops in taghosts.items() %} +{% for tag, taghosts in hosts.items() %} +{% for host, hostprops in taghosts.items() %} addNTA("{{ host }}.", "{{ tag }}") -{%- for a in hostprops['aliases'] %} +{% for a in hostprops['aliases'] %} addNTA("{{ a }}.", "{{ tag }} alias") -{%- endfor %} -{%- endfor %} -{%- endfor %} -{%- endif %} +{% endfor %} +{% endfor %} +{% endfor %} +{% endif %} -{% if forward_zones -%} +{% if forward_zones %} -- from 'service dns forwarding domain' -{%- for zone, zonedata in forward_zones.items() %} -{%- if zonedata['addNTA'] %} +{% for zone, zonedata in forward_zones.items() %} +{% if zonedata['addNTA'] %} addNTA("{{ zone }}", "static") -{%- endif %} -{%- endfor %} -{%- endif %} +{% endif %} +{% endfor %} +{% endif %} diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py index 53bc37882..d6eb76d91 100755 --- a/src/conf_mode/dns_forwarding.py +++ b/src/conf_mode/dns_forwarding.py @@ -148,10 +148,10 @@ def generate(dns): return None render(pdns_rec_config_file, 'dns-forwarding/recursor.conf.tmpl', - dns, user=pdns_rec_user, group=pdns_rec_group) + dns, trim_blocks=True, user=pdns_rec_user, group=pdns_rec_group) render(pdns_rec_lua_conf_file, 'dns-forwarding/recursor.conf.lua.tmpl', - dns, user=pdns_rec_user, group=pdns_rec_group) + dns, trim_blocks=True, user=pdns_rec_user, group=pdns_rec_group) # if vyos-hostsd didn't create its files yet, create them (empty) for f in [pdns_rec_hostsd_lua_conf_file, pdns_rec_hostsd_zones_file]: |