From e80e60f4a3f39712065c8708b428d94ed987233b Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Mon, 15 Apr 2024 19:26:02 +0200
Subject: [PATCH] Merge bielefeld (see
 https://web.archive.org/web/20210721164137/https://www.freifunk-bielefeld.de/?page_id=1313)
 and mueritz into kreisgt, release their ASNs.

---
 bielefeld | 26 ++++----------------------
 kreisgt   | 41 +++++++++++++++++++++++++++++++----------
 mueritz   | 28 +++-------------------------
 3 files changed, 38 insertions(+), 57 deletions(-)

diff --git a/bielefeld b/bielefeld
index 8b11116..6688e4b 100644
--- a/bielefeld
+++ b/bielefeld
@@ -1,23 +1,5 @@
+# merged into kreisgt, to be deleted
 tech-c:
-    - felixannen@web.de
-    - moritzwarning@web.de
-asn: 65529
-networks:
-  ipv4:
-    - 10.29.0.0/16
-    - 10.26.0.0/16
-  ipv6:
-    - fdef:17a0:ffb1::/48
-    - 2001:bf7:1320::/44
-delegate:
- 4242420022:
-    - fdef:17a0:ffb1:ffff::/64
-    - 10.26.64.0/18
-    - 10.26.48.0/20
-bgp:
-  bielefeldbgp1:
-    ipv4: 10.207.0.54
-    ipv6: fec0::a:cf:0:36
-#  bielefeldbgp2:
-#    ipv4: 10.207.0.59
-#    ipv6: fec0::a:cf:0:3b
+    - support@4830.org
+
+# asn: 65529
diff --git a/kreisgt b/kreisgt
index 27ee863..d837dfc 100644
--- a/kreisgt
+++ b/kreisgt
@@ -1,29 +1,50 @@
 tech-c:
-  - support@freifunk-kreisgt.de
+  - support@4830.org
 
 asn: 65533
 
 networks:
   ipv4:
-    - 10.255.0.0/16
+    - 10.26.0.0/16
+    - 10.29.0.0/16
+    - 10.169.0.0/16
     - 10.234.0.0/15
+    - 10.255.0.0/16
+
   ipv6:
-    - 2a06:e881:1700::/44
+    - fd10:ca1:1::/48
+    - fd10:ca1:2::/48
+    - fd10:ca1:3::/48
+    - fd10:ca1:4::/48
+    - fd10:ca1:11::/48
+    - fd10:ca1:12::/48
+    - fd10:ca1:17::/48
+    - fd10:ca1:66::/48
+    - fd10:ca1:bfe::/48
+    - fd39:e4e3:eee1::/48
+    - fdef:17a0:ffb1::/48
+    - fdff:fe1d:be86::/48
+    - 2001:bf7:170::/44
     - 2001:bf7:1310::/44
+    - 2001:bf7:1320::/44
+#    - 2001:bf7:1350::/44
 
 bgp:
-  kreisgt_fks:
-    ipv4: 10.207.0.134
-    ipv6: fec0::a:cf:0:86
-  kreisgt_gut:
+  kreisgt_a:
     ipv4: 10.207.0.137
     ipv6: fec0::a:cf:0:89
+  kreisgt_b:
+    ipv4: 10.207.0.138
+    ipv6: fec0::a:cf:0:8a
 
 domains:
   - 255.10.in-addr.arpa
   - 235.10.in-addr.arpa
   - 234.10.in-addr.arpa 
+  - 169.10.in-addr.arpa
+  - 29.10.in-addr.arpa
+  - 26.10.in-addr.arpa
 
-nameservers:
-  - 10.255.128.53
-  - 2001:bf7:1310:200::53
+#nameservers:
+#  - 10.255.128.53
+#  - 2001:bf7:1310:200::53
diff --git a/mueritz b/mueritz
index e8856d8..a82d20b 100644
--- a/mueritz
+++ b/mueritz
@@ -1,27 +1,5 @@
+# merged into kreisgt, to be deleted
 tech-c:
-  - support@4830.org
+    - support@4830.org
 
-asn: 65534
-
-networks:
-  ipv4:
-    - 10.169.0.0/16
-  ipv6:
-    - 2001:bf7:170::/44
-
-bgp:
-  mueritz_bgp1:
-    ipv4: 10.207.0.138
-    ipv6: fec0::a:cf:0:8a
-
-domains:
-  - mueritz
-  - 169.10.in-addr.arpa
-
-nameservers:
-  - 10.169.1.1
-
-delegate:
-  65533:
-   - 10.169.0.0/16
-   - 2001:bf7:170::/44
\ No newline at end of file
+# asn: 65534