dns-server: Distinguish options between recursor and authoritive servers.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>

dns-server/auth/init.sls

@@ -2,13 +2,19 @@
 # Authoritive FFHO DNS Server configuration (dns01/dns02 anycast)
 #
 
+{% set roles = salt['pillar.get']('nodes:' ~ grains['id'] ~ ':roles', []) %}
+
 include:
   - dns-server
 
 # Bind options
 /etc/bind/named.conf.options:
   file.managed:
+{% if 'dns-recursor' in roles %}
+    - source: salt://dns-server/auth/named.conf.options.recursor
+{% else %}
     - source: salt://dns-server/auth/named.conf.options
+{% endif %}
     - template: jinja
     - require:
       - pkg: bind9

dns-server/auth/named.conf.options

@@ -34,15 +34,5 @@ options {
 	allow-recursion {
 		127.0.0.1/8;
 		::1/128;
-
-		// Entries from pillar
-{%- for entry in salt['pillar.get']('dns-server:auth:allow-recursion', []) %}
-		{{ entry }};
-{%- endfor %}
 	};
-
-{%- if grains['id'] != 'dns01.in.ffho.net' %}
-	// Disable notifies on non-master DNS
-	notify no;
-{%- endif %}
 };