From b3d00be620bd868a3ff4b4fc38d06b3223875579 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 22 Jun 2020 12:23:44 +0200
Subject: [PATCH] update

---
 .../bird/peers/AS4242422341_zotan_internal.conf     |  3 +++
 nodes/fsn1/bird2/bird/roa_dn42.conf                 |  2 +-
 nodes/fsn1/bird2/bird/roa_dn42_v6.conf              |  2 +-
 nodes/fsn1/systemd-networkd/dn42i4.netdev           | 13 +++++++++++++
 nodes/fsn1/systemd-networkd/dn42i4.network          | 10 ++++++++++
 nodes/fsn2/bird2/bird/roa_dn42.conf                 |  2 +-
 nodes/fsn2/bird2/bird/roa_dn42_v6.conf              |  2 +-
 nodes/hel1/bird2/bird/roa_dn42.conf                 |  2 +-
 nodes/hel1/bird2/bird/roa_dn42_v6.conf              |  2 +-
 9 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_internal.conf
 create mode 100644 nodes/fsn1/systemd-networkd/dn42i4.netdev
 create mode 100644 nodes/fsn1/systemd-networkd/dn42i4.network

diff --git a/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_internal.conf b/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_internal.conf
new file mode 100644
index 0000000..26a389c
--- /dev/null
+++ b/nodes/fsn1/bird2/bird/peers/AS4242422341_zotan_internal.conf
@@ -0,0 +1,3 @@
+protocol bgp AS4242422341_zotan_internal from ipeers {
+        neighbor fdff:b02d:2ef7:acab::2%dn42i4;
+}
diff --git a/nodes/fsn1/bird2/bird/roa_dn42.conf b/nodes/fsn1/bird2/bird/roa_dn42.conf
index 7bf967e..eaffbe8 100644
--- a/nodes/fsn1/bird2/bird/roa_dn42.conf
+++ b/nodes/fsn1/bird2/bird/roa_dn42.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>
diff --git a/nodes/fsn1/bird2/bird/roa_dn42_v6.conf b/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
index e67e870..0569634 100644
--- a/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>
diff --git a/nodes/fsn1/systemd-networkd/dn42i4.netdev b/nodes/fsn1/systemd-networkd/dn42i4.netdev
new file mode 100644
index 0000000..e397f1e
--- /dev/null
+++ b/nodes/fsn1/systemd-networkd/dn42i4.netdev
@@ -0,0 +1,13 @@
+[NetDev]
+Name = dn42i4
+Kind = wireguard
+Description = WireGuard
+
+[WireGuard]
+ListenPort = 40004
+PrivateKeyFile = /etc/wireguard/private.key
+
+[WireGuardPeer]
+PublicKey = NnvVGhkWcEYwJqqGPaWrdIn6WuEadbouDxQdGsNjMjM=
+Endpoint = i.zotan.network:40001
+AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8
diff --git a/nodes/fsn1/systemd-networkd/dn42i4.network b/nodes/fsn1/systemd-networkd/dn42i4.network
new file mode 100644
index 0000000..1fe1860
--- /dev/null
+++ b/nodes/fsn1/systemd-networkd/dn42i4.network
@@ -0,0 +1,10 @@
+[Match]
+Name = dn42i4
+
+[Address]
+Address = fdff:b02d:2ef7::2/128
+Peer = fdff:b02d:2ef7:acab::2/128
+
+[Address]
+Address = 172.20.177.33/32
+Peer = 172.22.169.65/32
diff --git a/nodes/fsn2/bird2/bird/roa_dn42.conf b/nodes/fsn2/bird2/bird/roa_dn42.conf
index 7bf967e..eaffbe8 100644
--- a/nodes/fsn2/bird2/bird/roa_dn42.conf
+++ b/nodes/fsn2/bird2/bird/roa_dn42.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>
diff --git a/nodes/fsn2/bird2/bird/roa_dn42_v6.conf b/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
index e67e870..0569634 100644
--- a/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>
diff --git a/nodes/hel1/bird2/bird/roa_dn42.conf b/nodes/hel1/bird2/bird/roa_dn42.conf
index 7bf967e..eaffbe8 100644
--- a/nodes/hel1/bird2/bird/roa_dn42.conf
+++ b/nodes/hel1/bird2/bird/roa_dn42.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>
diff --git a/nodes/hel1/bird2/bird/roa_dn42_v6.conf b/nodes/hel1/bird2/bird/roa_dn42_v6.conf
index e67e870..0569634 100644
--- a/nodes/hel1/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/hel1/bird2/bird/roa_dn42_v6.conf
@@ -1,4 +1,4 @@
-# Updated at Sun Jun 21 23:32:18 MST 2020
+# Updated at Mon Jun 22 02:32:18 MST 2020
 #commit 6516ccbbf014de3f16104557c4d94dae111368fc
 #Merge: f6704d9 d6ee276
 #Author: burble <simon@burble.com>