From 166ceefa970146aef28faf2897c550efbb2c3928 Mon Sep 17 00:00:00 2001
From: Hung Nguyen Viet <hvn@robotinfra.com>
Date: Wed, 25 Mar 2015 10:27:32 +0700
Subject: [PATCH 1/5] there is no group bind if pkg is not installed

---
 bind/config.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bind/config.sls b/bind/config.sls
index 3811d15..fe68c3f 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -8,6 +8,8 @@ include:
     - user: root
     - group: bind
     - mode: 775
+    - require:
+      - pkg: bind
 
 bind_restart:
   service.running:

From de9bc987eee5bf3fefaf450a8caca9221b760d70 Mon Sep 17 00:00:00 2001
From: Hung Nguyen Viet <hvn@robotinfra.com>
Date: Wed, 25 Mar 2015 10:27:56 +0700
Subject: [PATCH 2/5] watch also does what require does and more

---
 bind/config.sls | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bind/config.sls b/bind/config.sls
index fe68c3f..c388056 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -17,8 +17,6 @@ bind_restart:
     - reload: False
     - watch:
       - file: {{ map.log_dir }}/query.log
-    - require:
-      - file: {{ map.log_dir }}/query.log
 
 {{ map.log_dir }}/query.log:
   file.managed:

From ece098cc086151877ad38b2f3a73428a110a02e4 Mon Sep 17 00:00:00 2001
From: Hung Nguyen Viet <hvn@robotinfra.com>
Date: Wed, 25 Mar 2015 10:29:08 +0700
Subject: [PATCH 3/5] remove duplicate arg

---
 bind/config.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bind/config.sls b/bind/config.sls
index c388056..29f19db 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -113,7 +113,6 @@ bind_default_zones:
     - template: jinja
     - user: root
     - group: root
-    - template: jinja
     - context:
         map: {{ map }}
 {% endif %}

From 8972734ba0280c17078964f720036994b1dcf1f7 Mon Sep 17 00:00:00 2001
From: Hung Nguyen Viet <hvn@robotinfra.com>
Date: Wed, 25 Mar 2015 10:30:01 +0700
Subject: [PATCH 4/5] require ID, not file path

---
 bind/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bind/config.sls b/bind/config.sls
index 29f19db..486d313 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -130,7 +130,7 @@ zones-{{ file }}:
     - watch_in:
       - service: bind
     - require:
-      - file: {{ map.named_directory }}
+      - file: named_directory
 
 {% if args['dnssec'] is defined and args['dnssec'] -%}
 signed-{{ file }}:
@@ -158,7 +158,7 @@ zones-{{ file }}:
     - watch_in:
       - service: bind
     - require:
-      - file: {{ map.named_directory }}
+      - file: named_directory
 
 {% if args['dnssec'] is defined and args['dnssec'] -%}
 signed-{{ file }}:

From 2beaf0ec327a4ca70373184406c701d3ece4dfa6 Mon Sep 17 00:00:00 2001
From: Hung Nguyen Viet <hvn@robotinfra.com>
Date: Wed, 25 Mar 2015 10:31:57 +0700
Subject: [PATCH 5/5] use group from map file, not hardcode

---
 bind/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bind/config.sls b/bind/config.sls
index 486d313..740559e 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -6,7 +6,7 @@ include:
 {{ map.log_dir }}:
   file.directory:
     - user: root
-    - group: bind
+    - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
     - mode: 775
     - require:
       - pkg: bind
@@ -21,7 +21,7 @@ bind_restart:
 {{ map.log_dir }}/query.log:
   file.managed:
     - user: bind
-    - group: bind
+    - group: {{ salt['pillar.get']('bind:config:group', map.group) }}
     - mode: 644
     - require:
       - file: {{ map.log_dir }}