From cbceb4c18f16b6bac35a09f516db3c022752551c Mon Sep 17 00:00:00 2001
From: Byggvir <thomas@arend-rhb.de>
Date: Wed, 21 Aug 2019 15:32:24 +0200
Subject: [PATCH 1/4] update IPv6 addresses to allocation

---
 meckenheim | 54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/meckenheim b/meckenheim
index b122d5f..2c6a15c 100644
--- a/meckenheim
+++ b/meckenheim
@@ -7,20 +7,46 @@ networks:
   ipv4:
     - 10.152.64.0/18
   ipv6:
-    - fda4:1721:8451::/48
-#bgp:
-#  meckenheim1:
-#    ipv4: 10.207.0.152
-#    ipv6: fec0::a:cf:0:98
-#  meckenheim2:
-#    ipv4: 10.207.1.152
-#    ipv6: fec0::a:cf:1:98  
+    - 2a03:2260:301a::/48
 domains:
-  - ffmck
+  - ffvor
   - 64.152.10.in-addr.arpa
-  - 1.5.4.8.1.2.7.1.4.a.d.f.ip6.arpa
+  - a.1.0.3.0.2.2.2.3.0.d.2.ip6.arpa
 nameservers:
-  - 10.152.64.10
-  - 10.152.80.10
-  - fda4:1721:8451:100::1
-  - fda4:1721:8451:200::1
+  - 10.152.64.2
+  - 10.152.64.3
+  - 10.152.80.2
+  - 10.152.80.3
+  - 2a03:2260:301a::1
+  - 2a03:2260:301a::2
+bgp:
+  voreifel1:
+    ipv4: 
+      - 100.64.10.43
+      - 100.64.10.45
+      - 100.64.10.47
+      - 100.64.10.49
+      - 100.64.10.51
+      - 100.64.10.53
+    ipv6: 
+      - 2a03:2260:0:524::2
+      - 2a03:2260:0:525::2
+      - 2a03:2260:0:526::2
+      - 2a03:2260:0:527::2
+      - 2a03:2260:0:528::2
+      - 2a03:2260:0:529::2
+  voreifel2:
+    ipv4: 
+      - 100.64.10.55
+      - 100.64.10.57
+      - 100.64.10.59
+      - 100.64.10.61
+      - 100.64.10.63
+      - 100.64.10.65
+    ipv6: 
+      - 2a03:2260:0:51e::2
+      - 2a03:2260:0:521::2
+      - 2a03:2260:0:520::2
+      - 2a03:2260:0:523::2
+      - 2a03:2260:0:51f::2
+      - 2a03:2260:0:522::2

From 65a432cb32a2691f3d75ad0c031184eb51dd0734 Mon Sep 17 00:00:00 2001
From: Byggvir <thomas@arend-rhb.de>
Date: Wed, 21 Aug 2019 16:12:45 +0200
Subject: [PATCH 2/4] only one IP address for bgp

---
 meckenheim | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/meckenheim b/meckenheim
index 2c6a15c..d637687 100644
--- a/meckenheim
+++ b/meckenheim
@@ -11,7 +11,7 @@ networks:
 domains:
   - ffvor
   - 64.152.10.in-addr.arpa
-  - a.1.0.3.0.2.2.2.3.0.d.2.ip6.arpa
+  - a.1.0.3.0.6.2.2.3.0.d.2.ip6.arpa
 nameservers:
   - 10.152.64.2
   - 10.152.64.3
@@ -21,32 +21,9 @@ nameservers:
   - 2a03:2260:301a::2
 bgp:
   voreifel1:
-    ipv4: 
-      - 100.64.10.43
-      - 100.64.10.45
-      - 100.64.10.47
-      - 100.64.10.49
-      - 100.64.10.51
-      - 100.64.10.53
-    ipv6: 
-      - 2a03:2260:0:524::2
-      - 2a03:2260:0:525::2
-      - 2a03:2260:0:526::2
-      - 2a03:2260:0:527::2
-      - 2a03:2260:0:528::2
-      - 2a03:2260:0:529::2
+    ipv4: 10.152.64.2
+    ipv6: 2a03:2260:301a::1
   voreifel2:
     ipv4: 
-      - 100.64.10.55
-      - 100.64.10.57
-      - 100.64.10.59
-      - 100.64.10.61
-      - 100.64.10.63
-      - 100.64.10.65
-    ipv6: 
-      - 2a03:2260:0:51e::2
-      - 2a03:2260:0:521::2
-      - 2a03:2260:0:520::2
-      - 2a03:2260:0:523::2
-      - 2a03:2260:0:51f::2
-      - 2a03:2260:0:522::2
+      - 100.152.64.3
+    ipv6: 2a03:2260:301a::2

From d4840a9def323ea5079f7ced6790ff436aa0a0dd Mon Sep 17 00:00:00 2001
From: Byggvir <thomas@arend-rhb.de>
Date: Wed, 21 Aug 2019 16:22:40 +0200
Subject: [PATCH 3/4] change address from 100. to 10.

---
 meckenheim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meckenheim b/meckenheim
index d637687..b55845d 100644
--- a/meckenheim
+++ b/meckenheim
@@ -25,5 +25,5 @@ bgp:
     ipv6: 2a03:2260:301a::1
   voreifel2:
     ipv4: 
-      - 100.152.64.3
+      - 10.152.64.3
     ipv6: 2a03:2260:301a::2

From 96c6798bec49fdf35c4f0c65494b56c153c900e8 Mon Sep 17 00:00:00 2001
From: Byggvir <thomas@arend-rhb.de>
Date: Wed, 21 Aug 2019 16:29:33 +0200
Subject: [PATCH 4/4] remove bgp configuration

---
 meckenheim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meckenheim b/meckenheim
index b55845d..107049e 100644
--- a/meckenheim
+++ b/meckenheim
@@ -11,7 +11,7 @@ networks:
 domains:
   - ffvor
   - 64.152.10.in-addr.arpa
-  - a.1.0.3.0.6.2.2.3.0.d.2.ip6.arpa
+  - a.1.0.3.0.6.2.2.3.0.a.2.ip6.arpa
 nameservers:
   - 10.152.64.2
   - 10.152.64.3
@@ -19,11 +19,11 @@ nameservers:
   - 10.152.80.3
   - 2a03:2260:301a::1
   - 2a03:2260:301a::2
-bgp:
-  voreifel1:
-    ipv4: 10.152.64.2
-    ipv6: 2a03:2260:301a::1
-  voreifel2:
-    ipv4: 
-      - 10.152.64.3
-    ipv6: 2a03:2260:301a::2
+#bgp:
+#  voreifel1:
+#    ipv4: 10.152.64.2
+#    ipv6: 2a03:2260:301a::1
+#  voreifel2:
+#    ipv4: 
+#      - 10.152.64.3
+#    ipv6: 2a03:2260:301a::2