fix named_directory bug in Debian/Ubuntu by using the map value instead of hardcoding

Author: Joe Bowman

bind/config.sls

@@ -119,6 +119,7 @@ bind_options_config:
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - context:
         key_directory: {{ map.key_directory }}
+        named_directory: {{ map.named_directory }}
     - require:
       - pkg: bind
     - watch_in:

bind/files/arch/named.conf

@@ -1,7 +1,7 @@
 // vim:set ts=4 sw=4 et:
 
 options {
-    directory "/var/named";
+    directory "{{ named_directory }}";
     pid-file "/run/named/named.pid";
 
     // Uncomment these to enable IPv6 connections support

bind/files/debian/named.conf.options

@@ -1,7 +1,7 @@
 {%- set key_directory = salt['pillar.get']('bind:lookup:key_directory', key_directory) %}
 
 options {
-        directory "/var/cache/bind";
+        directory "{{ named_directory }}";
 
         // If there is a firewall between you and nameservers you want
         // to talk to, you may need to fix the firewall to allow multiple

bind/files/freebsd/named.conf

@@ -11,7 +11,7 @@
 options {
 	// All file and path names are relative to the chroot directory,
 	// if any, and should be fully qualified.
-	directory	"/usr/local/etc/namedb/working";
+	directory	"{{ named_directory }}";
 	pid-file	"/var/run/named/pid";
 	dump-file	"/var/dump/named_dump.db";
 	statistics-file	"/var/stats/named.stats";
@@ -389,4 +389,3 @@ key "{{ key }}" {
 {%- for incl in salt['pillar.get']('bind:config:includes', []) %}
 include "{{ incl }}";
 {% endfor %}
-

bind/files/redhat/named.conf

@@ -8,7 +8,7 @@
 //
 
 options {
-        directory       "/var/named";
+        directory       "{{ named_directory }}";
         dump-file       "/var/named/data/cache_dump.db";
         statistics-file "/var/named/data/named_stats.txt";
         memstatistics-file "/var/named/data/named_mem_stats.txt";

bind/files/suse/named.conf

@@ -18,7 +18,7 @@ options {
 
 	# The directory statement defines the name server's working directory
 
-	directory "/var/lib/named";
+	directory "{{ named_directory }}";
 
 	# enable DNSSEC validation
 	#