From 264c2966723f017ecdd5f295e3813b33925bd7e4 Mon Sep 17 00:00:00 2001
From: Florian <florian.ermisch@tu-berlin.de>
Date: Wed, 1 Jun 2016 19:17:27 +0200
Subject: [PATCH] fix broken zones_source_dir on RedHat/Debian

Als add docs for how to overwrite the path.

Fixes saltstack-formulas/bind-formula#60?
---
 README.rst     | 4 ++++
 bind/map.jinja | 4 ++--
 pillar.example | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index c88ae43..dc7c4ae 100644
--- a/README.rst
+++ b/README.rst
@@ -24,6 +24,10 @@ Install the bind package and start the bind service.
 ---------------
 
 Manage the bind configuration file.
+Zone files are not generated by this state
+rather than taken from `salt://zones`.
+See `pillar.example` for how to overwrite
+this URL.
 
 Example Pillar
 ==============
diff --git a/bind/map.jinja b/bind/map.jinja
index fec64a5..af4ac55 100644
--- a/bind/map.jinja
+++ b/bind/map.jinja
@@ -3,7 +3,7 @@
         'pkgs': ['bind9', 'bind9utils', 'dnssec-tools'],
         'service': 'bind9',
         'config_source_dir': 'bind/files/debian',
-        'zones_source_dir': '/srv/salt/zones',
+        'zones_source_dir': 'zones',
         'config': '/etc/bind/named.conf',
         'local_config': '/etc/bind/named.conf.local',
         'key_config': '/etc/bind/named.conf.key',
@@ -20,7 +20,7 @@
         'pkgs': ['bind'],
         'service': 'named',
         'config_source_dir': 'bind/files/redhat',
-        'zones_source_dir': '/srv/salt/zones',
+        'zones_source_dir': 'zones',
         'config': '/etc/named.conf',
         'local_config': '/etc/named.conf.local',
         'default_config': '/etc/sysconfig/named',
diff --git a/pillar.example b/pillar.example
index 4c4c8c6..23a41ea 100644
--- a/pillar.example
+++ b/pillar.example
@@ -3,6 +3,9 @@ bind:
     pkgs:
       - bind
     service: named
+    # take zonefiles from `salt://bind/zonedata`
+    # instead of `salt://zones`:
+    zones_source_dir: bind/zonedata
 
 bind:
   config: