From b2873fbfedace463240836536d40df95ed81870e Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@wiked.org>
Date: Sat, 1 Mar 2014 15:18:09 -0800
Subject: [PATCH] restoring map.user and map.group for defaults.

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

diff --git a/bind/config.sls b/bind/config.sls
index 8040125..e8a86a1 100644
--- a/bind/config.sls
+++ b/bind/config.sls
@@ -6,8 +6,8 @@ include:
 named_directory:
   file.directory:
     - name: {{ map.named_directory }}
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'root') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: 775
     - makedirs: True
     - require:
@@ -34,8 +34,8 @@ bind_local_config:
     - name: {{ map.local_config }}
     - source: 'salt://bind/files/redhat/named.conf.local'
     - template: jinja
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'root') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - require:
       - pkg: bind
@@ -64,8 +64,8 @@ bind_local_config:
     - name: {{ map.local_config }}
     - source: 'salt://bind/files/debian/named.conf.local'
     - template: jinja
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'bind') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - require:
       - pkg: bind
@@ -78,8 +78,8 @@ bind_options_config:
     - name: {{ map.options_config }}
     - source: 'salt://bind/files/debian/named.conf.options'
     - template: jinja
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'bind') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - require:
       - pkg: bind
@@ -92,8 +92,8 @@ bind_default_zones:
     - name: {{ map.default_zones_config }}
     - source: 'salt://bind/files/debian/named.conf.default-zones'
     - template: jinja
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'bind') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - require:
       - pkg: bind
@@ -116,8 +116,8 @@ zones-{{ file }}:
     - managed
     - name: {{ map.named_directory }}/{{ file }}
     - source: 'salt://bind/zones/{{ file }}'
-    - user: {{ salt['pillar.get']('bind:config:user', 'root') }}
-    - group: {{ salt['pillar.get']('bind:config:group', 'root') }}
+    - user: {{ salt['pillar.get']('bind:config:user', 'map.user') }}
+    - group: {{ salt['pillar.get']('bind:config:group', 'map.group') }}
     - mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
     - watch_in:
       - service: bind