From 287efef933aa176161719ce971c09289e99c5ecf Mon Sep 17 00:00:00 2001
From: Alexander Dietrich <alexander@dietrich.cx>
Date: Sun, 1 Sep 2019 13:26:49 +0200
Subject: [PATCH] Some cleanup in ffhh.conf

---
 ffhh.conf | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/ffhh.conf b/ffhh.conf
index 56ff9be..01cdbab 100644
--- a/ffhh.conf
+++ b/ffhh.conf
@@ -1,10 +1,6 @@
-# Keys we allow for editing
-
+# Keys we allow for editing (unused?)
 #include "/etc/bind/secrets.conf";
 
-#Zones WE have authority over!
-
-#Apperantly for ffhh.
 zone "ffhh" IN {
     type master;
     file "/etc/bind/master/db.ffhh";
@@ -14,38 +10,38 @@ zone "ffhh" IN {
 
 zone "hamburg.freifunk.net" IN {
     type master;
+    file "/etc/bind/master/db.net.freifunk.hamburg";
     allow-transfer {
         144.76.58.2; # named.ohrensessel.net
     };
     also-notify {
         144.76.58.2; # named.ohrensessel.net
     };
-    file "/etc/bind/master/db.net.freifunk.hamburg";
 };
 
 zone "knotengraph.de" IN {
     type master;
+    file "/etc/bind/master/db.de.knotengraph";
     allow-transfer {
         144.76.58.2; # named.ohrensessel.net
     };
     also-notify {
         144.76.58.2; # named.ohrensessel.net
     };
-    file "/etc/bind/master/db.de.knotengraph";
 };
 
 zone "knotenkarte.de" IN {
     type master;
+    file "/etc/bind/master/db.de.knotenkarte";
     allow-transfer {
         144.76.58.2; # named.ohrensessel.net
     };
     also-notify {
         144.76.58.2; # named.ohrensessel.net
     };
-    file "/etc/bind/master/db.de.knotenkarte";
 };
 
-#And the reverse Zone for our IPv4 subnet
+# Reverse zone: IPv4 subnet 10.112 (internal)
 zone "112.10.in-addr.arpa" IN {
     type master;
     file "/etc/bind/master/db.arpa.in-addr.10.112";
@@ -53,7 +49,7 @@ zone "112.10.in-addr.arpa" IN {
     allow-update { key srv01-zone-key.; };
 };
 
-#And the reverse Zone for our IPv4 transfer net
+# Reverse zone: IPv4 subnet 100.64.112 (transfer)
 zone "112.64.100.in-addr.arpa" IN {
     type master;
     file "/etc/bind/master/db.arpa.in-addr.100.64.112";
@@ -61,7 +57,7 @@ zone "112.64.100.in-addr.arpa" IN {
     allow-update { key srv01-zone-key.; };
 };
 
-#The reverse Zone for our public IPv4 subnet
+# Reverse zone: IPv4 subnet 193.96.224 (public)
 zone "224.96.193.in-addr.arpa" IN {
     type master;
     file "/etc/bind/master/db.arpa.in-addr.193.96.224";
@@ -77,7 +73,7 @@ zone "224.96.193.in-addr.arpa" IN {
     };
 };
 
-#And the reverse Zone for our IPv6 prefix
+# Reverse zone: IPv6 prefix 2a03:2267
 zone "7.6.2.2.3.0.a.2.ip6.arpa" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7";
@@ -90,30 +86,39 @@ zone "7.6.2.2.3.0.a.2.ip6.arpa" IN {
     allow-update { key srv01-zone-key.; };
 };
 
+# Reverse zone: IPv6 prefix 2a03:2267:0000:0000
 zone "0.0.0.0.0.0.0.0.7.6.2.2.3.0.a.2.ip6.arpa.upstream" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7.0.0.0.0.0.0.0.0";
     allow-transfer { any; };
     allow-update { key srv01-zone-key.; };
 };
+
+# Reverse zone: IPv6 prefix 2a03:2267:0001:0000 (sued)
 zone "0.0.0.0.1.0.0.0.7.6.2.2.3.0.a.2.ip6.arpa.upstream" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7.0.0.0.1.0.0.0.0";
     allow-transfer { any; };
     allow-update { key srv01-zone-key.; };
 };
+
+# Reverse zone: IPv6 prefix 2a03:2267:0002:0000 (west)
 zone "0.0.0.0.2.0.0.0.7.6.2.2.3.0.a.2.ip6.arpa.upstream" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7.0.0.0.2.0.0.0.0";
     allow-transfer { any; };
     allow-update { key srv01-zone-key.; };
 };
+
+# Reverse zone: IPv6 prefix 2a03:2267:0003:0000 (nowe)
 zone "0.0.0.0.3.0.0.0.7.6.2.2.3.0.a.2.ip6.arpa.upstream" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7.0.0.0.3.0.0.0.0";
     allow-transfer { any; };
     allow-update { key srv01-zone-key.; };
 };
+
+# Reverse zone: IPv6 prefix 2a03:2267:0004:0000 (ost)
 zone "0.0.0.0.4.0.0.0.7.6.2.2.3.0.a.2.ip6.arpa.upstream" IN {
     type master;
     file "/etc/bind/master/db.arpa.ip6.2.a.0.3.2.2.6.7.0.0.0.4.0.0.0.0";