diff --git a/roles/ns/templates/named.conf.master.j2 b/roles/ns/templates/named.conf.master.j2 index e923cc5..3d0a2e0 100644 --- a/roles/ns/templates/named.conf.master.j2 +++ b/roles/ns/templates/named.conf.master.j2 @@ -15,17 +15,17 @@ options { }; view "lan" { - match-clients { - {% for item in key_match_clients_lan_master if item.startswith("!key") %} - {{ item }}; - {% endfor %} + match-clients { +{% for item in key_match_clients_lan_master if item.startswith("!key") %} + {{ item }}; +{% endfor %} {% for item in acl_match_clients %} {{ item }}; - {% endfor %} +{% endfor %} {% for item in key_match_clients_lan_master if not item.startswith("!key") %} {{ item }}; - {% endfor %} -}; +{% endfor %} + }; plugin query "filter-aaaa.so" { filter-aaaa-on-v4 yes; @@ -40,14 +40,14 @@ view "lan" { include "/etc/bind/named.conf.default-zones"; - {% for zone in bind_zones.lan %} +{% for zone in bind_zones.lan %} zone "{{ zone.name }}" { type master; forwarders {}; allow-update { key {{ zone.key }}; }; file "{{ zone.file }}"; }; - {% endfor %} +{% endfor %} }; view "wan" { @@ -60,25 +60,26 @@ view "wan" { notify explicit; also-notify { - {% for entry in bind_also_notify %} +{% for entry in bind_also_notify %} {{ entry.ip }} key {{ entry.key }}; - {% endfor %} +{% endfor %} }; - {% for zone in bind_zones.wan %} - {% if zone.in_view is defined %} - {% for z in zone.in_view %} +{% for zone in bind_zones.wan %} +{% if zone.in_view is defined %} +{% for z in zone.in_view %} zone "{{ z }}" { in-view "lan"; }; - {% endfor %} - {% else %} +{% endfor %} +{% else %} zone "{{ zone.name }}" { type master; forwarders {}; allow-update { key {{ zone.key }}; }; file "{{ zone.file }}"; }; - {% endif %} - {% endfor %} +{% endif %} +{% endfor %} }; +