nameserver-secondary: adopt primary/secondary naming

We use here the more recent BIND zone type defintion, either primary or secondary at this role. This changes the named config files as well as the ferm config file.

Author: mathiashro

roles/nameserver-secondary/defaults/main.yml

@@ -1,10 +1,11 @@
-dns_zone_masters_ipv4:
-  - 139.30.241.202
-  - 192.168.10.2
+dns_zone_primaries_ipv4:
+  - 192.168.10.7
+  - 139.30.241.205
 
-dns_zone_masters_ipv6:
-  - 2001:638:804:2228:5652:ff:fe41:6e19
+dns_zone_primaries_ipv6:
+  - fd32:d8d3:87da::10:7
+  - 2001:638:804:2228:216:3eff:feb0:9e05
 
-dns_zone_master_with_dnskey: heartofgold.opennet-initiative.de
+dns_zone_primary_with_dnskey: ns.opennet-initiative.de
 
 nameserver_secondary_ipv6: fd32:d8d3:87da::53

roles/nameserver-secondary/tasks/bind.yml

@@ -3,8 +3,8 @@
 
 - block:
   - name: bind - dnskey vom primaeren DNS-Server abholen
-    delegate_to: root@{{ dns_zone_master_with_dnskey }}
-    shell: grep -w 'secret' /etc/bind/named.conf.options | cut -f 2 -d '"'
+    delegate_to: root@{{ dns_zone_primary_with_dnskey }}
+    shell: grep -w 'secret' /etc/bind/keys/opennet-transfer.key | cut -f 2 -d '"'
     register: dnskey_secret_fetch
     changed_when: False
     run_once: yes

roles/nameserver-secondary/templates/ferm/320_dns-zone-slave.inc

@@ -3,9 +3,9 @@
 # Lokale Anpassungen koennen unter /etc/ferm/ferm.d/ abgelegt werden.
 ###############################################################################
 
-@def $DNS_ZONE_MASTERS_IPv4 = ({{ dns_zone_masters_ipv4|join(' ') }});
-@def $DNS_ZONE_MASTERS_IPv6 = ({{ dns_zone_masters_ipv6|join(' ') }});
+@def $DNS_ZONE_PRIMARIES_IPv4 = ({{ dns_zone_primaries_ipv4|join(' ') }});
+@def $DNS_ZONE_PRIMARIES_IPv6 = ({{ dns_zone_primaries_ipv6|join(' ') }});
 
 # DNS-Zonentransfers
-domain ip table filter chain service-input proto tcp dport domain saddr $DNS_ZONE_MASTERS_IPv4 ACCEPT;
-domain ip6 table filter chain service-input proto tcp dport domain saddr $DNS_ZONE_MASTERS_IPv6 ACCEPT;
+domain ip table filter chain service-input proto tcp dport domain saddr $DNS_ZONE_PRIMARIES_IPv4 ACCEPT;
+domain ip6 table filter chain service-input proto tcp dport domain saddr $DNS_ZONE_PRIMARIES_IPv6 ACCEPT;

roles/nameserver-secondary/templates/named.conf.local

@@ -2,7 +2,7 @@
 
 acl opennet {
 	127.0.0.0/8; 10.0.0.0/8; 192.168.0.0/16;
-	{{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }};
+	{{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }};
 	::1; fd32:d8d3:87da::/48; 2a0a:4580:1010::/48;
 };
 
@@ -14,8 +14,8 @@ key dnskey.opennet {
 
 
 // diesen Schluessel allen Verbindungen mit den Opennet-DNS-Mastern zuordnen
-{% for master in (dns_zone_masters_ipv4 + dns_zone_masters_ipv6) %}
-server {{ master }} { keys dnskey.opennet; };
+{% for primary in (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4) %}
+server {{ primary }} { keys dnskey.opennet; };
 {% endfor %}
 
 
@@ -50,33 +50,33 @@ logging {
 zone "on." {
 	type    slave;
 	file    "db.on";
-	masters { {{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }}; };
+	primaries { {{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }}; };
 };
 
 //on - reverse
 zone "168.192.in-addr.arpa" {
 	type    slave;
 	file    "db.192.168";
-	masters { {{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }}; };
+	primaries { {{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }}; };
 };
 
 //on-vpn - reverse
 zone "1.10.in-addr.arpa" {
 	type    slave;
 	file    "db.10.1";
-	masters { {{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }}; };
+	primaries { {{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }}; };
 };
 
 //on-ugw reverse
 zone "2.10.in-addr.arpa" {
 	type    slave;
 	file    "db.10.2";
-	masters { {{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }}; };
+	primaries { {{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }}; };
 };
 
 //on-v6-ula - reverse
 zone "a.d.7.8.3.d.8.d.2.3.d.f.ip6.arpa" {
 	type    slave;
 	file    "db.fd32_d8d3_87da";
-	masters { {{ (dns_zone_masters_ipv4 + dns_zone_masters_ipv6)|join('; ') }}; };
+	primaries { {{ (dns_zone_primaries_ipv6 + dns_zone_primaries_ipv4)|join('; ') }}; };
 };