saltstack-formulas/bind-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/bind-formula.git synced 2025-04-16 17:50:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iteritems() -> items(), fixes saltstack-formulas/bind-formula#30

Browse source
This commit is contained in:
Florian 2016-06-01 19:00:16 +02:00
parent 50b37ea28c
commit 8b52b73753
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bind/config.sls
View file

@ -130,7 +130,7 @@ bind_default_zones:
map: {{ map }} map: {{ map }}
{% endif %} {% endif %}
{% for zone, zone_data in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%} {% for zone, zone_data in salt['pillar.get']('bind:configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + zone + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + zone + ":file") %}
{% if file and zone_data['type'] == "master" -%} {% if file and zone_data['type'] == "master" -%}
zones-{{ zone }}: zones-{{ zone }}:
@ -157,8 +157,8 @@ signed-{{ zone }}:
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{%- for view, view_data in salt['pillar.get']('bind:configured_views', {}).iteritems() %} {%- for view, view_data in salt['pillar.get']('bind:configured_views', {}).items() %}
{% for zone, zone_data in view_data.get('configured_zones', {}).iteritems() -%} {% for zone, zone_data in view_data.get('configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + zone + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + zone + ":file") %}
{% if file and zone_data['type'] == "master" -%} {% if file and zone_data['type'] == "master" -%}
zones-{{ view }}-{{ zone }}: zones-{{ view }}-{{ zone }}:

2
bind/files/arch/named.conf
View file

@ -11,7 +11,7 @@ options {
// listen-on { none; }; // listen-on { none; };
{#- Allow inclusion of arbitrary statements #} {#- Allow inclusion of arbitrary statements #}
{%- for statement, value in salt['pillar.get']('bind:config:options', {}).iteritems() -%} {%- for statement, value in salt['pillar.get']('bind:config:options', {}).items() -%}
{%- if value is iterable and value is not string %} {%- if value is iterable and value is not string %}
{{ statement }} { {{ statement }} {
{%- for item in value %} {%- for item in value %}

2
bind/files/arch/named.conf.local
View file

@ -6,7 +6,7 @@
// organization // organization
//include "/etc/bind/zones.rfc1918"; //include "/etc/bind/zones.rfc1918";
{% for key,args in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%} {% for key,args in salt['pillar.get']('bind:configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %} {%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %}
zone "{{ key }}" { zone "{{ key }}" {

2
bind/files/debian/named.conf.key
View file

@ -3,7 +3,7 @@
// Do any local configuration here // Do any local configuration here
// //
{% for key,args in salt['pillar.get']('bind:keys', {}).iteritems() -%} {% for key,args in salt['pillar.get']('bind:keys', {}).items() -%}
key "{{ key }}" { key "{{ key }}" {
algorithm {{ args['algorithm'] | default('HMAC-MD5.SIG-ALG.REG.INT') }}; algorithm {{ args['algorithm'] | default('HMAC-MD5.SIG-ALG.REG.INT') }};
secret "{{ args['secret'] }}"; secret "{{ args['secret'] }}";

6
bind/files/debian/named.conf.local
View file

@ -60,13 +60,13 @@ zone "{{ key }}" {
include "{{ map.default_zones_config }}"; include "{{ map.default_zones_config }}";
{%- endif %} {%- endif %}
{% for key, args in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%} {% for key, args in salt['pillar.get']('bind:configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %} {%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %}
{{ zone(key, args, file, masters) }} {{ zone(key, args, file, masters) }}
{% endfor %} {% endfor %}
{% for view, view_data in salt['pillar.get']('bind:configured_views', {}).iteritems() %} {% for view, view_data in salt['pillar.get']('bind:configured_views', {}).items() %}
view {{ view }} { view {{ view }} {
{%- if view == 'default' %} {%- if view == 'default' %}
@ -79,7 +79,7 @@ match-clients {
{%- endfor %} {%- endfor %}
}; };
{% for key, args in view_data.get('configured_zones', {}).iteritems() -%} {% for key, args in view_data.get('configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %} {%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %}
{{ zone(key, args, file, masters) }} {{ zone(key, args, file, masters) }}

2
bind/files/debian/named.conf.options
View file

@ -21,7 +21,7 @@ options {
{%- endif -%} {%- endif -%}
{#- Allow inclusion of arbitrary statements #} {#- Allow inclusion of arbitrary statements #}
{%- for statement, value in salt['pillar.get']('bind:config:options', {}).iteritems() -%} {%- for statement, value in salt['pillar.get']('bind:config:options', {}).items() -%}
{%- if value is iterable and value is not string %} {%- if value is iterable and value is not string %}
{{ statement }} { {{ statement }} {
{%- for item in value %} {%- for item in value %}

2
bind/files/redhat/named.conf.local
View file

@ -6,7 +6,7 @@
// organization // organization
//include "/etc/bind/zones.rfc1918"; //include "/etc/bind/zones.rfc1918";
{% for key,args in salt['pillar.get']('bind:configured_zones', {}).iteritems() -%} {% for key,args in salt['pillar.get']('bind:configured_zones', {}).items() -%}
{%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %} {%- set file = salt['pillar.get']("bind:available_zones:" + key + ":file") %}
{%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %} {%- set masters = salt['pillar.get']("bind:available_zones:" + key + ":masters") %}
zone "{{ key }}" { zone "{{ key }}" {