Fixed condition to include key_config. Added possibility to include default-zones on Debian systems.

This commit is contained in:
Uwe Kretschmer 2016-03-03 09:51:39 +01:00
parent 81fea01f6d
commit 48ba120d45
2 changed files with 15 additions and 7 deletions

View file

@ -1,13 +1,17 @@
// This is the primary configuration file for the BIND DNS server named.
//
// Please read /usr/share/doc/bind9/README.Debian.gz for information on the
// structure of BIND configuration files in Debian, *BEFORE* you customize
// Please read /usr/share/doc/bind9/README.Debian.gz for information on the
// structure of BIND configuration files in Debian, *BEFORE* you customize
// this configuration file.
//
// If you are just adding zones, please do that in /etc/bind/named.conf.local
include "{{ map.options_config }}";
include "{{ map.local_config }}";
{%- if salt['pillar.get']('bind:keys', {}) is defined %}
{%- if 'keys' in salt['pillar.get']('bind') %}
include "{{ map.key_config }}";
{% endif %}
{%- if salt['pillar.get']('bind:config:default_zones', False) %}
include "{{ map.default_zones_config }}";
{% endif %}

View file

@ -13,8 +13,12 @@ bind:
options:
allow-recursion: '{ any; };' # Never include this on a public resolver
# force bind to serve only one IP protocol (ipv4: 4, ipv6: 6). omitting this reverts to binds default of both.
protocol: 4
# force bind to serve only one IP protocol (ipv4: 4, ipv6: 6). omitting this reverts to binds default of both.
protocol: 4
# For Debian based systems:
# If set to True, the default-zones configuration will be enabled. Defaults to False.
default_zones: True
bind:
keys:
@ -29,7 +33,7 @@ bind:
notify: False
allow-transfer:
- 1.1.1.1
- 2.2.2.2
- 2.2.2.2
dynamic.domain.com:
type: master
allow-update: "key core_dhcp"
@ -38,7 +42,7 @@ bind:
type: forward
forwarders:
- 10.9.8.7
- 10.9.8.5
- 10.9.8.5
configured_views:
myview1:
match_clients: