daniel/ansible-bind9-role
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indentation Saga

Browse Source
This commit is contained in:
Daniel Akulenok
2022-08-30 16:02:43 +02:00
parent ba17ed2716
commit de1fd88f69
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/named.conf.generator.j2
View File

@@ -1,4 +1,4 @@
{% import 'named.conf.functions.j2' as functions %} {% import 'named.conf.functions.j2' as functions with context %}
{{ ansible_managed | comment }} {{ ansible_managed | comment }}
{% if item.options is defined and item.options %} {% if item.options is defined and item.options %}
{% from 'named.conf.options.j2' import options with context %} {% from 'named.conf.options.j2' import options with context %}
@@ -51,7 +51,7 @@ options {
{% endif %} {% endif %}
{% if item.parental_agents is defined and item.parental_agents %} {% if item.parental_agents is defined and item.parental_agents %}
{% from 'named.conf.parental-agents.j2' import parental_agents with context %} {% from 'named.conf.parental-agents.j2' import parental_agents with context %}
{{ parental_agents(item.parental_agents) }} {{ parental_agents(item.parental_agents) -}}
{% endif %} {% endif %}
{% if item.server is defined and item.server %} {% if item.server is defined and item.server %}
{% from 'named.conf.server.j2' import server with context %} {% from 'named.conf.server.j2' import server with context %}

6
templates/named.conf.options.j2
View File

@@ -2,7 +2,7 @@
{# Unicorn Options#} {# Unicorn Options#}
{% if option.rrset_order is defined and option.rrset_order %} {% if option.rrset_order is defined and option.rrset_order %}
rrset-order { rrset-order {
{% filter indent(bind9_config_indent*2, true) %} {% filter indent(bind9_config_indent, true) %}
{% for rrset in option.rrset_order %} {% for rrset in option.rrset_order %}
{{ ('class ' + rrset.class | string + ' ') if rrset.class is defined and rrset.class -}} {{ ('class ' + rrset.class | string + ' ') if rrset.class is defined and rrset.class -}}
{{ ('type ' + rrset.type | string + ' ') if rrset.type is defined and rrset.type -}} {{ ('type ' + rrset.type | string + ' ') if rrset.type is defined and rrset.type -}}
@@ -38,7 +38,7 @@ response-policy {
{{- (' nsip-enable ' + functions.named_boolean(option.response_policy.nsip_enable)) if option.response_policy.nsip_enable is defined -}} {{- (' nsip-enable ' + functions.named_boolean(option.response_policy.nsip_enable)) if option.response_policy.nsip_enable is defined -}}
{{- (' nsdname-enable ' + functions.named_boolean(option.response_policy.nsdname_enable)) if option.response_policy.nsdname_enable is defined -}} {{- (' nsdname-enable ' + functions.named_boolean(option.response_policy.nsdname_enable)) if option.response_policy.nsdname_enable is defined -}}
{{- (' dnsrps-enable ' + functions.named_boolean(option.response_policy.dnsrps_enable)) if option.response_policy.dnsrps_enable is defined -}} {{- (' dnsrps-enable ' + functions.named_boolean(option.response_policy.dnsrps_enable)) if option.response_policy.dnsrps_enable is defined -}}
{{- (' dnsrps-options {\n' + functions.simple_item_list(option.response_policy.dnsrps_options) + '}') if option.response_policy.dnsrps_options is defined and option.response_policy.dnsrps_options -}}; {{- (' dnsrps-options { ' + option.response_policy.dnsrps_options | join('; ') + '; }') if option.response_policy.dnsrps_options is defined and option.response_policy.dnsrps_options -}};
{% endif %} {% endif %}
{% if option.response_padding is defined and option.response_padding %} {% if option.response_padding is defined and option.response_padding %}
response-padding { response-padding {
@@ -164,7 +164,7 @@ check-names {{ policy.type }} {{ policy.action }};
catalog-zones { catalog-zones {
{% for catalog_zone in option.catalog_zones %} {% for catalog_zone in option.catalog_zones %}
zone {{ catalog_zone.zone }} zone {{ catalog_zone.zone }}
{% filter indent(bind9_config_indent*3, true) %} {% filter indent(bind9_config_indent, true) %}
{% if catalog_zone.default_primaries is defined and catalog_zone.default_primaries %} {% if catalog_zone.default_primaries is defined and catalog_zone.default_primaries %}
default-primaries default-primaries
{{- (' port ' + catalog_zone.default_primaries.port | string) if catalog_zone.default_primaries.port is defined and catalog_zone.default_primaries.port -}} {{- (' port ' + catalog_zone.default_primaries.port | string) if catalog_zone.default_primaries.port is defined and catalog_zone.default_primaries.port -}}

5
templates/named.conf.parental-agents.j2
View File

@@ -3,8 +3,7 @@
parental-agents {{ agent.name -}} parental-agents {{ agent.name -}}
{{ (' port ' + agent.port | string) if agent.port is defined and agent.port -}} {{ (' port ' + agent.port | string) if agent.port is defined and agent.port -}}
{{ (' dscp ' + agent.dscp | string) if agent.dscp is defined and agent.dscp }} { {{ (' dscp ' + agent.dscp | string) if agent.dscp is defined and agent.dscp }} {
{% filter indent(bind9_config_indent, true) %} {{ functions.list_address_port_key_tls(agent.addresses) -}}};
{{ functions.list_address_port_key_tls(agent.addresses) -}}
{% endfilter %}};
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}