commit fbfa168f1f0b9abc0ab1184071128d21cc92d683
author Ales Komarek <mail@newt.cz> Mon Sep 22 11:31:14 2014 +0200
committer Ales Komarek <mail@newt.cz> Mon Sep 22 11:31:14 2014 +0200
tree 9f4305ddc21efff78466a3cc7104af3428eb2faf
parent 882ac7b7228b3550fd1cad493ad766accba7ba20

all

map.jinja

diff --git a/map.jinja b/map.jinja
index 7411982..ff9678b 100644
--- a/map.jinja
+++ b/map.jinja
@@ -1,22 +1,25 @@
-{% set server = salt['grains.filter_by']({
-    'Debian': {
-        'pkgs': ['bind9', 'bind9utils'],
-        'service': 'bind9',
-        'config': '/etc/bind/named.conf',
-        'local_config': '/etc/bind/named.conf.local',
-        'options_config': '/etc/bind/named.conf.options',
-        'default_zones_config': '/etc/bind/named.conf.default-zones',
-        'named_directory': '/var/cache/bind/zones',
-        'user': 'root',
-        'group': 'bind'
-    },
-    'RedHat': {
-        'pkgs': ['bind'],
-        'service': 'named',
-        'config': '/etc/named.conf',
-        'local_config': '/etc/named.conf.local',
-        'named_directory': '/var/named/data',
-        'user': 'root',
-        'group': 'named'
-    },
+
+{%- set server = salt['grains.filter_by']({
+  'Debian': {
+    'pkgs': ['bind9', 'bind9utils'],
+    'service': 'bind9',
+    'config': '/etc/bind/named.conf',
+    'local_config': '/etc/bind/named.conf.local',
+    'options_config': '/etc/bind/named.conf.options',
+    'default_zones_config': '/etc/bind/named.conf.default-zones',
+    'named_dir': '/var/cache/bind/zones',
+    'rndc_key': '/etc/rndc.key',
+    'user': 'root',
+    'group': 'bind'
+  },
+  'RedHat': {
+    'pkgs': ['bind'],
+    'service': 'named',
+    'config': '/etc/named.conf',
+    'local_config': '/etc/named.conf.local',
+    'named_dir': '/var/named/data',
+    'rndc_key': '/etc/rndc.key',
+    'user': 'root',
+    'group': 'named'
+  },
 }, merge=salt['pillar.get']('bind:server')) %}