demacro zone and view

This commit is contained in:
Daniel Akulenok
2024-05-14 14:36:54 +02:00
parent 73d8632c49
commit b6fa879b93
3 changed files with 5 additions and 10 deletions

View File

@@ -54,10 +54,8 @@ options {
{% include 'named.conf.trust-anchors.j2' %} {% include 'named.conf.trust-anchors.j2' %}
{% endif %} {% endif %}
{% if item.zones is defined and item.zones %} {% if item.zones is defined and item.zones %}
{% from 'named.conf.zone.j2' import zones with context %} {% include 'named.conf.zone.j2' %}
{{ zones(item.zones) }}
{% endif %} {% endif %}
{% if item.view is defined and item.view %} {% if item.view is defined and item.view %}
{% from 'named.conf.view.j2' import view with context %} {% include 'named.conf.view.j2' %}
{{ view(item.view) }}
{% endif %} {% endif %}

View File

@@ -1,5 +1,4 @@
{% macro view(views) %} {% for view in item.view if item.view is iterable %}
{% for view in views if views is iterable %}
view {{ view.name }} { view {{ view.name }} {
{% filter indent(bind9_config_indent, true) %} {% filter indent(bind9_config_indent, true) %}
{{ ('match-recursive-only ' + functions.named_boolean(view.match_recursive_only) + ';\n') if view.match_recursive_only is defined -}} {{ ('match-recursive-only ' + functions.named_boolean(view.match_recursive_only) + ';\n') if view.match_recursive_only is defined -}}
@@ -75,4 +74,4 @@ view {{ view.name }} {
{{ trust_anchors(view.trust_anchors) -}} {{ trust_anchors(view.trust_anchors) -}}
{% endif %} {% endif %}
{% endfilter %} {% endfilter %}
};{% endfor %}{% endmacro %} };{% endfor %}

View File

@@ -1,6 +1,5 @@
# Zones Macro # Zones Macro
{% macro zones(zones) -%} {% for zone in item.zones %}
{% for zone in zones %}
zone "{{ zone.name }}" { zone "{{ zone.name }}" {
{% filter indent(bind9_config_indent, true) %} {% filter indent(bind9_config_indent, true) %}
# Zone {{ zone.name }} type {{ zone.type }} # Zone {{ zone.name }} type {{ zone.type }}
@@ -159,4 +158,3 @@ parental-source-v6 {{ zone.parental_source_v6.address -}}
}; };
{% endfor %} {% endfor %}
{% endmacro %}