Merge pull request #45 from cybacolt/master

- templatize default file

bind/config.sls

@@ -67,17 +67,16 @@ bind_local_config:
     - watch_in:
       - service: bind
 
-{% if salt['pillar.get']('bind:config:protocol', False) %}
 bind_default_config:
   file.managed:
     - name: {{ map.default_config }}
-    - source: salt://{{ map.config_source_dir }}/default_{{ salt['pillar.get']('bind:config:protocol', 'ipv4') }}
+    - source: salt://{{ map.config_source_dir }}/default
+    - template: jinja
     - user: root
     - group: root
     - mode: 644
     - watch_in:
       - service: bind_restart
-{% endif %}
 
 {% if grains['os_family'] == 'Debian' %}
 bind_key_config:

bind/files/debian/default

@@ -0,0 +1,12 @@
+{% set protocol = salt['pillar.get']('bind:config:protocol', False) -%}
+{% set param = ['-u bind'] -%}
+{% if protocol -%}
+  {%- param.append('-' + protocol|string) -%}
+{% endif -%}
+# run resolvconf?
+RESOLVCONF=no
+
+# startup options for the server
+# force ipv4 only
+OPTIONS="{{ param|join(' ') }}"
+

bind/files/debian/default_ipv4

@@ -1,7 +0,0 @@
-# run resolvconf?
-RESOLVCONF=no
-
-# startup options for the server
-# force ipv4 only
-OPTIONS="-4 -u bind"
-

bind/files/debian/default_ipv6

@@ -1,7 +0,0 @@
-# run resolvconf?
-RESOLVCONF=no
-
-# startup options for the server
-# force ipv4 only
-OPTIONS="-6 -u bind"
-

bind/files/redhat/default

@@ -0,0 +1,9 @@
+{% set protocol = salt['pillar.get']('bind:config:protocol', False) -%}
+{% set param = [] -%}
+{% if protocol -%}
+  {%- param.append('-' + protocol|string) -%}
+{% endif -%}
+# ROOTDIR="/var/named/chroot"
+# KEYTAB_FILE="/dir/file"
+# DISABLE_ZONE_CHECKING
+OPTIONS="{{ param|join(' ') }}"

bind/files/redhat/default_ipv4

@@ -1,4 +0,0 @@
-# ROOTDIR="/var/named/chroot"
-# KEYTAB_FILE="/dir/file"
-# DISABLE_ZONE_CHECKING
-OPTIONS="-4"

bind/files/redhat/default_ipv6

@@ -1,4 +0,0 @@
-# ROOTDIR="/var/named/chroot"
-# KEYTAB_FILE="/dir/file"
-# DISABLE_ZONE_CHECKING
-OPTIONS="-6"

pillar.example

@@ -13,6 +13,9 @@ 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
+
 bind:
   keys:
     "core_dhcp":