pr feedback

dd-ix · Jan 11, 2024 · 5e0fe6c · 5e0fe6c
1 parent 5dc768f
commit 5e0fe6c
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 69 deletions.
diff --git a/modules/management/bind9.nix b/modules/management/bind9.nix
@@ -5,19 +5,19 @@ let
   ibh_ans_ip = [
     # ans-01.ibh.de
     "212.111.228.50"
-    #"2a01:7700:0:1035::1:50"
+    "2a01:7700:0:1035::1:50"
     # ans-02.ibh.net
     "193.36.123.50"
-    #"2a01:7700:0:1036::1:50"
+    "2a01:7700:0:1036::1:50"
     # ans-03.ibh.de
     "195.30.105.203"
-    #"2001:608:c00:10::1:138"
+    "2001:608:c00:10::1:138"
     # ans-04.ibh.services
     "167.235.139.88"
-    #"2a01:4f8:c0c:74b9::1"
+    "2a01:4f8:c0c:74b9::1"
     # ans-05.ibh.net
     "65.109.1.68"
-    #"2a01:4f9:c012:61fd::1"
+    "2a01:4f9:c012:61fd::1"
   ];
 in
 {
@@ -33,23 +33,14 @@ in
         master = true;
         file = self + "/resource/dd-ix.net.zone";
         slaves = ibh_ans_ip;
-        allowQuery = ibh_ans_ip ++ ["127.0.0.0/8" "::1/128"];
       };
-      # reverse zone for IX IPv4
-      #"120.36.193.in-addr.arpa" = {
-      #  master = true;
-      #  file = "${file_dir}/120.36.193.in-addr.arpa";
-      #  slaves = ibh_ans_ip;
-      #  allowQuery = ibh_ans_ip ++ [ "127.0.0.0/8" "::1/128" ];
-      #};
 
-      # reverse zone for IX IPv6
-      #"8.1.d.d.9.1.0.0.8.f.7.0.1.0.0.2.ip6.arpa" = {
-      #  master = true;
-      #  file = "${file_dir}/8.1.d.d.9.1.0.0.8.f.7.0.1.0.0.2.ip6.arpa";
-      #  slaves = ibh_ans_ip;
-      #  allowQuery = ibh_ans_ip ++ [ "127.0.0.0/8" "::1/128" ];
-      #};
+      # ipv6 pa
+      "0.b.0.8.0.0.7.7.1.0.a.2.ip6.arpa" = {
+        master = true;
+        file = self + "/resource/0.b.0.8.0.0.7.7.1.0.a.2.ip6.arpa.zone";
+        slaves = ibh_ans_ip;
+      };
     };
 
     extraOptions = ''

diff --git a/resources/0.b.0.8.0.0.7.7.1.0.a.2.ip6.arpa.zone b/resources/0.b.0.8.0.0.7.7.1.0.a.2.ip6.arpa.zone
@@ -0,0 +1,21 @@
+; Check me with (abs. path required....)
+; named-checkzone dd-ix.net /.../resources/dd-ix.net.zone
+
+$TTL    1h         ; default TTL for zone
+
+0.b.0.8.0.0.7.7.1.0.a.2.ip6.arpa.  SOA  ns.dd-ix.net  noc.dd-ix.net.  (
+        2024011100  ;Serial
+        7200        ;Refresh
+        3600        ;Retry
+        1209600     ;Expire
+        3600        ;Negative response caching TTL
+)
+
+;; NS Records
+  86400  NS  ans-01.ibh.de.
+  86400  NS  ans-02.ibh.net.
+  86400  NS  ans-03.ibh.de.
+  86400  NS  ans-04.ibh.services.
+  86400  NS  ans-05.ibh.net.
+
+;; PTR Records
diff --git a/resources/dd-ix.net.zone b/resources/dd-ix.net.zone
@@ -2,59 +2,51 @@
 ; named-checkzone dd-ix.net /.../resources/dd-ix.net.zone
 
 $TTL    1h         ; default TTL for zone
-$ORIGIN dd-ix.net. ; base domain-name
 
-@  3600  IN  SOA  ns.dd-ix.net  noc.dd-ix.net.  (
-        2020080302  ;Serial
+dd-ix.net.  SOA  ns.dd-ix.net  noc.dd-ix.net.  (
+        2024011100  ;Serial
         7200        ;Refresh
         3600        ;Retry
         1209600     ;Expire
         3600        ;Negative response caching TTL
 )
 
-;; NS Records
-@  86400   IN  NS  ans-01.ibh.de.
-@  86400   IN  NS  ans-02.ibh.net.
-@  86400   IN  NS  ans-03.ibh.de.
-@  86400   IN  NS  ans-04.ibh.services.
-@  86400   IN  NS  ans-05.ibh.net.
-
-;; A Records
-@    600  IN  A  212.111.245.178
-rpx  600  IN  A  212.111.245.178
-
-ns   600  IN  A  212.111.245.179
-
-;; CNAME Records
-www      IN  CNAME  rpx
-content  IN  CNAME  rpx
-
-auth     IN  CNAME  rpx
-cloud    IN  CNAME  rpx
-wiki     IN  CNAME  rpx
-dcim     IN  CNAME  rpx
-lists    IN  CNAME  rpx
-vault    IN  CNAME  rpx
-
-;; BACKUP
-*        IN  CNAME  @
-
-autoconfig       IN  CNAME  autoconfig.migadu.com.
-key1._domainkey  IN  CNAME  key1.dd-ix.net._domainkey.migadu.com.
-key2._domainkey  IN  CNAME  key2.dd-ix.net._domainkey.migadu.com.
-key3._domainkey  IN  CNAME  key3.dd-ix.net._domainkey.migadu.com.
-
-;; MX Records
-@  IN  MX  20  aspmx2.migadu.com.
-@  IN  MX  10  aspmx1.migadu.com.
-
-;; SRV Records
-_autodiscover._tcp  IN  SRV  0  1  443 autodiscover.migadu.com.
-_imaps._tcp         IN  SRV  0  1  993 imap.migadu.com.
-_pop3s._tcp         IN  SRV  0  1  995 pop.migadu.com.
-_submissions._tcp   IN  SRV  0  1  465 smtp.migadu.com.
-
-;; TXT Records
-@       IN  TXT  "v=spf1 include:spf.migadu.com -all"
-@       IN  TXT  "hosted-email-verify=ddocclet"
-_dmarc  IN  TXT  "v=DMARC1; p=quarantine;"
+  86400  NS   ans-01.ibh.de.
+  86400  NS   ans-02.ibh.net.
+  86400  NS   ans-03.ibh.de.
+  86400  NS   ans-04.ibh.services.
+  86400  NS   ans-05.ibh.net.
+
+  600    A    212.111.245.178
+         TXT  "v=spf1 include:spf.migadu.com -all"
+         TXT  "hosted-email-verify=ddocclet"
+
+         MX  20  aspmx2.migadu.com.
+         MX  10  aspmx1.migadu.com.
+
+rpx.dd-ix.net.  600  A  212.111.245.178
+ns.dd-ix.net.   600  A  212.111.245.179
+
+www.dd-ix.net.      CNAME  rpx.dd-ix.net.
+content.dd-ix.net.  CNAME  rpx.dd-ix.net.
+auth.dd-ix.net.     CNAME  rpx.dd-ix.net.
+cloud.dd-ix.net.    CNAME  rpx.dd-ix.net.
+wiki.dd-ix.net.     CNAME  rpx.dd-ix.net.
+dcim.dd-ix.net.     CNAME  rpx.dd-ix.net.
+lists.dd-ix.net.    CNAME  rpx.dd-ix.net.
+vault.dd-ix.net.    CNAME  rpx.dd-ix.net.
+
+;; BACKUP only: TODO remove
+*.dd-ix.net.        CNAME  dd-ix.net.
+
+autoconfig.dd-ix.net.       CNAME  autoconfig.migadu.com.
+key1._domainkey.dd-ix.net.  CNAME  key1.dd-ix.net._domainkey.migadu.com.
+key2._domainkey.dd-ix.net.  CNAME  key2.dd-ix.net._domainkey.migadu.com.
+key3._domainkey.dd-ix.net.  CNAME  key3.dd-ix.net._domainkey.migadu.com.
+
+_autodiscover._tcp.dd-ix.net.  SRV  0  1  443 autodiscover.migadu.com.
+_imaps._tcp.dd-ix.net.         SRV  0  1  993 imap.migadu.com.
+_pop3s._tcp.dd-ix.net.         SRV  0  1  995 pop.migadu.com.
+_submissions._tcp.dd-ix.net.   SRV  0  1  465 smtp.migadu.com.
+
+_dmarc.dd-ix.net.  TXT  "v=DMARC1; p=quarantine;"