Skip to content
This repository was archived by the owner on Feb 14, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/etc/bind/named.conf.acl.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// {{ ansible_managed }}

{% if bind_named_conf_acl is defined %}
{% for key, content in bind_named_conf_acl.iteritems() %}
{% for key, content in bind_named_conf_acl.items() %}
acl "{{ key }}" {
{% for line in content.split('\n')[:-1] %}
{{ line }}
Expand Down
2 changes: 1 addition & 1 deletion templates/etc/bind/named.conf.keys.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// {{ ansible_managed }}

{% if bind_named_conf_keys is defined %}
{% for key_name, key in bind_named_conf_keys.iteritems() | sort %}
{% for key_name, key in bind_named_conf_keys.items() | sort %}
key "{{ key_name }}" {
algorithm {{ key['algorithm'] }};
secret "{{ key['secret'] }}";
Expand Down
12 changes: 6 additions & 6 deletions templates/etc/bind/named.conf.local.j2
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
{% endif %}

{% if bind_views is defined %}
{% for view, content in bind_views.iteritems() |sort %}
{% for view, content in bind_views.items() |sort %}
view "{{ view }}" {
{% for param,value in content.options.iteritems() | sort %}
{% for param,value in content.options.items() | sort %}
{{ param }} {{ value }};
{% endfor %}
{% if content.zones is defined %}
{% for zone,content in content.zones.iteritems() | sort %}
{% for zone,content in content.zones.items() | sort %}
zone "{{ zone }}" {
{% for param,value in content.iteritems() | sort %}
{% for param,value in content.items() | sort %}
{{ param }} {{ value }};
{% endfor %}
};
Expand All @@ -34,9 +34,9 @@ view "{{ view }}" {
{% endif %}

{% if bind_zones is defined and bind_views is not defined %}
{% for zone, content in bind_zones.iteritems() | sort %}
{% for zone, content in bind_zones.items() | sort %}
zone "{{ zone }}" {
{% for param, value in content.iteritems() | sort %}
{% for param, value in content.items() | sort %}
{{ param }} {{ value }};
{% endfor %}
};
Expand Down
4 changes: 2 additions & 2 deletions templates/etc/bind/named.conf.logging.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

{% if bind_named_conf_logging is defined and bind_named_conf_logging.channels is defined %}
logging {
{% for channel, content in bind_named_conf_logging.channels.iteritems() | sort %}
{% for channel, content in bind_named_conf_logging.channels.items() | sort %}
channel {{ channel }} {
{% for line in content.split('\n') %}
{{ line }}
{% endfor %}
};
{% endfor %}

{% for category, channel in bind_named_conf_logging.categories.iteritems() %}
{% for category, channel in bind_named_conf_logging.categories.items() %}
{# Old Style #}
{% if channel is string %}
category {{ category }} { {{ channel }}; };
Expand Down
4 changes: 2 additions & 2 deletions templates/etc/bind/named.conf.zones.j2
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% if bind_zones is defined and bind_views is defined %}
include "/etc/bind/named.conf.default-zones";
include "/etc/bind/named.conf.revzones";
{% for zone, content in bind_zones.iteritems() | sort %}
{% for zone, content in bind_zones.items() | sort %}
zone "{{ zone }}" {
{% for param, value in content.iteritems() | sort %}
{% for param, value in content.items() | sort %}
{{ param }} {{ value }};
{% endfor %}
};
Expand Down
2 changes: 1 addition & 1 deletion templates/var/cache/bind/db.name.zone.j2
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; {{ ansible_managed }}

{% if 'directives' in item.value %}
{% for directive, value in item.value.directives.iteritems() %}
{% for directive, value in item.value.directives.items() %}
${{ directive }} {{ value }}
{% endfor %}
{% endif %}
Expand Down