Merge pull request #4 from ryanwalder/fix-for-the-fix

Make `zones_directory` compatible with all distros

Author: joe-bowman

bind/config.sls

@@ -7,6 +7,12 @@
 {%- set key_size = salt['pillar.get']('bind:lookup:key_size', map.key_size) %}
 {%- set key_flags = {'zsk': 256, 'ksk': 257} %}
 
+{%- if map.get('zones_directory') %}
+  {%- set zones_directory = map.zones_directory %}
+{%- else %}
+  {%- set zones_directory = map.named_directory %}
+{%- endif %}
+
 include:
   - bind
 
@@ -45,16 +51,18 @@ named_directory:
     - require:
       - pkg: bind
 
+{% if map.get('zones_directory') %}
 bind_zones_directory:
   file.directory:
-    - name: {{ map.named_directory }}/{{ map.zones_directory }}
+    - name: {{ zones_directory }}
     - user: {{ salt['pillar.get']('bind:config:user', map.user) }}
     - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
     - mode: 775
     - makedirs: True
     - require:
       - pkg: bind
       - file: named_directory
+{% endif %}
 
 bind_config:
   file.managed:
@@ -85,6 +93,7 @@ bind_local_config:
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - context:
         map: {{ map }}
+        zones_directory: {{ zones_directory }}
     - require:
       - pkg: bind
       - file: {{ map.chroot_dir }}{{ map.log_dir }}/query.log
@@ -131,7 +140,7 @@ bind_options_config:
     - context:
         key_directory: {{ map.key_directory }}
         named_directory: {{ map.named_directory }}
-        zones_directory: {{ map.zones_directory }}
+        zones_directory: {{ zones_directory }}
     - require:
       - pkg: bind
     - watch_in:
@@ -209,7 +218,7 @@ bind_rndc_client_config:
 {% if file and zone_data['type'] == 'master' -%}
 zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else ''}}:
   file.managed:
-    - name: {{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}{{ '.include' if serial_auto else ''}}
+    - name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else ''}}
     - source: {{ zone_source }}
     - template: jinja
     {% if zone_records != {} %}
@@ -226,7 +235,9 @@ zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else ''}}:
       - service: bind
     - require:
       - file: named_directory
+      {% if map.get('zones_directory') %}
       - file: bind_zones_directory
+      {% endif %}
 
 {% if serial_auto %}
 zones{{ dash_view }}-{{ zone }}:
@@ -235,9 +246,9 @@ zones{{ dash_view }}-{{ zone }}:
     - update: True
     - zone: zones{{ dash_view }}-{{ zone }}
     - watch:
-      - file: {{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}.include
+      - file: {{ zones_directory }}/{{ file }}.include
   file.managed:
-    - name: {{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}
+    - name: {{ zones_directory }}/{{ file }}
     - require:
       - module: zones{{ dash_view }}-{{ zone }}
     - source: {{ zone_source }}
@@ -246,7 +257,7 @@ zones{{ dash_view }}-{{ zone }}:
     - context:
       zone: zones{{ dash_view }}-{{ zone }}
       soa: {{ salt['pillar.get']("bind:available_zones:" + zone + ":soa") }}
-      include: {{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}.include
+      include: {{ zones_directory }}/{{ file }}.include
     {% endif %}
     - user: {{ salt['pillar.get']('bind:config:user', map.user) }}
     - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
@@ -255,12 +266,14 @@ zones{{ dash_view }}-{{ zone }}:
       - service: bind
     - require:
       - file: named_directory
+      {% if map.get('zones_directory') %}
       - file: bind_zones_directory
+      {% endif %}
 {% endif %}
 {% if zone_data['dnssec'] is defined and zone_data['dnssec'] -%}
 signed{{ dash_view }}-{{ zone }}:
   cmd.run:
-    - cwd: {{ map.named_directory }}/{{ map.zones_directory }}
+    - cwd: {{ zones_directory }}
     - name: zonesigner -zone {{ zone }} {{ file }}
     - prereq:
       - file: zones{{ dash_view }}-{{ zone }}

bind/files/named.conf.local.jinja

@@ -21,9 +21,9 @@ zone "{{ key }}" {
   };
   {% else -%}
   {% if args['dnssec'] is defined and args['dnssec'] -%}
-  file "{{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}.signed";
+  file "{{ zones_directory }}/{{ file }}.signed";
   {% else -%}
-  file "{{ map.named_directory }}/{{ map.zones_directory }}/{{ file }}";
+  file "{{ zones_directory }}/{{ file }}";
   {%- endif %}
   {% if args['auto-dnssec'] is defined -%}
   auto-dnssec {{ args['auto-dnssec'] }};

bind/map.jinja

@@ -13,7 +13,7 @@
         'logging_config': '/etc/bind/named.conf.logging',
         'rndc_client_config': '/etc/bind/rndc.conf',
         'named_directory': '/var/cache/bind',
-        'zones_directory': 'zones',
+        'zones_directory': '/var/cache/bind/zones',
         'chroot_dir': '',
         'log_dir': '/var/log/bind9',
         'log_mode': '644',
@@ -37,7 +37,6 @@
         'local_config': '/etc/named.conf.local',
         'default_config': '/etc/sysconfig/named',
         'named_directory': '/var/named',
-        'zones_directory': 'zones',
         'chroot_dir': '',
         'log_dir': '/var/log/named',
         'log_mode': '640',
@@ -65,7 +64,6 @@
         'config': '/etc/named.conf',
         'local_config': '/etc/named.conf.local',
         'named_directory': '/var/named',
-        'zones_directory': 'zones',
         'chroot_dir': '',
         'log_dir': '/var/log/named',
         'log_mode': '640',
@@ -85,7 +83,6 @@
         'config': '/usr/local/etc/namedb/named.conf',
         'local_config': '/usr/local/etc/namedb/named.conf.local',
         'named_directory': '/usr/local/etc/namedb/working',
-        'zones_directory': 'zones',
         'chroot_dir': '',
         'log_dir': '/var/log/named',
         'log_mode': '660',
@@ -106,7 +103,6 @@
         'local_config': '/etc/named.d/named.conf.local',
         'default_config': '/etc/sysconfig/named',
         'named_directory': '/var/lib/named',
-        'zones_directory': 'zones',
         'chroot_dir': '/var/lib/named',
         'log_dir': '/var/log',
         'log_mode': '660',