bind: ctxify 'public-ns'

salt-pillar/bind/dns.sls

@@ -6,7 +6,10 @@ bind:
     dn42: dns.serv.zentralwerk.dn42
     up1: dns.serv.zentralwerk.org
   public-ns:
-    - ns.c3d2.de
+    dn42:
+      - dns.serv.zentralwerk.dn42
+    up1:
+      - ns.c3d2.de
   slaves:
     # ns.c3d2.de
     - 217.197.84.53

salt/bind/dyn-domain.zone

@@ -2,12 +2,12 @@ $ORIGIN {{ domain }}.
 $TTL 10M
 
 @		IN SOA	{{ pillar['bind']['master-ns']['up1'] }}. astro.spaceboyz.net. (
-				2  ; serial
+				3  ; serial
 				1H ; refresh
 				1M ; retry
 				2H ; expire
 				5M ; minimum
 			)
-{%- for ns in pillar['bind']['public-ns'] %}
+{%- for ns in pillar['bind']['public-ns']['up1'] %}
 		IN NS	{{ ns }}.
 {%- endfor %}

salt/bind/net-domain.zone

@@ -8,7 +8,7 @@ $TTL 10M
 				2H ; expire
 				5M ; minimum
 			)
-{%- for ns in pillar['bind']['public-ns'] %}
+{%- for ns in pillar['bind']['public-ns'][ctx] %}
 		IN NS	{{ ns }}.
 {%- endfor %}
 

salt/bind/reverse.zone

@@ -8,7 +8,7 @@ $TTL 10M
 				2H ; expire
 				5M ; minimum
 			)
-		IN NS	{{ pillar['bind']['master-ns'][ctx] }}.
+		IN NS	{{ pillar['bind']['public-ns'][ctx] }}.
 
 {%- if ctx == 'dn42' %}
 {%-   for net, hosts in pillar['hosts-inet'].items() %}

salt/bind/root-domain.zone

@@ -8,16 +8,16 @@ $TTL 10M
 				2H ; expire
 				5M ; minimum
 			)
-{%- for ns in pillar['bind']['public-ns'] %}
+{%- for ns in pillar['bind']['public-ns'][ctx] %}
 		IN NS	{{ ns }}.
 {%- endfor %}
 
 {%- for net, hosts in pillar['hosts-inet'].items() %}
-{%-   for ns in pillar['bind']['public-ns'] %}
+{%-   for ns in pillar['bind']['public-ns'][ctx] %}
 {{ net }}		IN NS	{{ ns }}.
 {%-   endfor %}
 {%- endfor %}
 
-{%-   for ns in pillar['bind']['public-ns'] %}
+{%-   for ns in pillar['bind']['public-ns'][ctx] %}
 dyn		IN NS	{{ ns }}.
 {%-   endfor %}