From 72adedf3bc378f8c9a981deaeb45e44e32a72e05 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 4 Apr 2020 21:37:06 +0200 Subject: [PATCH] add peers, add multicast --- nodes/fsn1/systemd-networkd/dn42i1.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42i2.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42i3.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42p1.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42p2.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42p3.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42p4.netdev | 2 +- nodes/fsn1/systemd-networkd/dn42p5.netdev | 2 +- nodes/fsn2/systemd-networkd/dn42i1.netdev | 2 +- nodes/fsn2/systemd-networkd/dn42i2.netdev | 2 +- nodes/fsn2/systemd-networkd/dn42i3.netdev | 2 +- nodes/hel1/bird2/bird/peers/AS4242421588_tech9.conf | 7 +++++++ nodes/hel1/systemd-networkd/dn42i1.netdev | 2 +- nodes/hel1/systemd-networkd/dn42i2.netdev | 2 +- nodes/hel1/systemd-networkd/dn42i3.netdev | 2 +- nodes/hel1/systemd-networkd/dn42p1.netdev | 2 +- nodes/hel1/systemd-networkd/dn42p2.netdev | 13 +++++++++++++ nodes/hel1/systemd-networkd/dn42p2.network | 10 ++++++++++ nodes/nbg1/bird2/bird/peers/AS4242421588_tech9.conf | 7 +++++++ nodes/nbg1/systemd-networkd/dn42i1.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42i2.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42i3.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42p1.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42p2.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42p3.netdev | 2 +- nodes/nbg1/systemd-networkd/dn42p4.netdev | 13 +++++++++++++ nodes/nbg1/systemd-networkd/dn42p4.network | 10 ++++++++++ 27 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 nodes/hel1/bird2/bird/peers/AS4242421588_tech9.conf create mode 100644 nodes/hel1/systemd-networkd/dn42p2.netdev create mode 100644 nodes/hel1/systemd-networkd/dn42p2.network create mode 100644 nodes/nbg1/bird2/bird/peers/AS4242421588_tech9.conf create mode 100644 nodes/nbg1/systemd-networkd/dn42p4.netdev create mode 100644 nodes/nbg1/systemd-networkd/dn42p4.network diff --git a/nodes/fsn1/systemd-networkd/dn42i1.netdev b/nodes/fsn1/systemd-networkd/dn42i1.netdev index 0221954..22db323 100644 --- a/nodes/fsn1/systemd-networkd/dn42i1.netdev +++ b/nodes/fsn1/systemd-networkd/dn42i1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = PlMza8PC6N58vpGqMsBo3UjvjXThl/2WCTK6drjqbgY= Endpoint = nbg1.dn42.zotan.network:40001 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42i2.netdev b/nodes/fsn1/systemd-networkd/dn42i2.netdev index 0403c75..e8a546b 100644 --- a/nodes/fsn1/systemd-networkd/dn42i2.netdev +++ b/nodes/fsn1/systemd-networkd/dn42i2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = B+3QYRU5UqaWYAsKMfyk7wqDzsFZ31RluCakeXEVm2E= Endpoint = hel1.dn42.zotan.network:40001 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42i3.netdev b/nodes/fsn1/systemd-networkd/dn42i3.netdev index 208c5f3..e2edcca 100644 --- a/nodes/fsn1/systemd-networkd/dn42i3.netdev +++ b/nodes/fsn1/systemd-networkd/dn42i3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = s7Fo3iH24V6lpZ6rYFE3U5bK0y9nwbhQzdYI8B4hvV0= Endpoint = prod.zotan.network:40001 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p1.netdev b/nodes/fsn1/systemd-networkd/dn42p1.netdev index 21770ed..aa657ae 100644 --- a/nodes/fsn1/systemd-networkd/dn42p1.netdev +++ b/nodes/fsn1/systemd-networkd/dn42p1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/graffen.key [WireGuardPeer] PublicKey = qChjUaGN7D44d+3KJk4liFQvm8EQuKGYXlCMOYQhLx8= Endpoint = dn42-de-fsn1.hessnet.dk:22341 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p2.netdev b/nodes/fsn1/systemd-networkd/dn42p2.netdev index ba20db3..3eda906 100644 --- a/nodes/fsn1/systemd-networkd/dn42p2.netdev +++ b/nodes/fsn1/systemd-networkd/dn42p2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/manawyrm.key [WireGuardPeer] PublicKey = z4drftGk8vvWwTfCCMJYjWWzHP7bCJSvlMpEbEkFI2U= Endpoint = dn42.tbspace.de:49035 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p3.netdev b/nodes/fsn1/systemd-networkd/dn42p3.netdev index 2748cca..6c4ca39 100644 --- a/nodes/fsn1/systemd-networkd/dn42p3.netdev +++ b/nodes/fsn1/systemd-networkd/dn42p3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = ttIiOeCZw9pFD9HATXK7T3eOGViJEgNolAsiXJdPgjc= Endpoint = ch-zrh01.dn42.munsternet.eu:51846 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p4.netdev b/nodes/fsn1/systemd-networkd/dn42p4.netdev index 997e952..5be1bb0 100644 --- a/nodes/fsn1/systemd-networkd/dn42p4.netdev +++ b/nodes/fsn1/systemd-networkd/dn42p4.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = aD4W4RrdiAlq9mZQQ459cq1nmcGW4k9A6GnopZbnxXE= Endpoint = dn42-de-fra1.burble.com:22341 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p5.netdev b/nodes/fsn1/systemd-networkd/dn42p5.netdev index 28b5613..8fcccab 100644 --- a/nodes/fsn1/systemd-networkd/dn42p5.netdev +++ b/nodes/fsn1/systemd-networkd/dn42p5.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = OxX4oGg6XCefMLKqC3T9wmQfwvvkVg1O9PRx5quLrXA= Endpoint = dn42-gw.weiti.org:22341 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn2/systemd-networkd/dn42i1.netdev b/nodes/fsn2/systemd-networkd/dn42i1.netdev index 263668f..3f2f720 100644 --- a/nodes/fsn2/systemd-networkd/dn42i1.netdev +++ b/nodes/fsn2/systemd-networkd/dn42i1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = F3gqp7BZaIXgVjB1KM4ausbAgO0jnwlZwuUtEgj0RRo= Endpoint = fsn1.dn42.zotan.network:40003 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn2/systemd-networkd/dn42i2.netdev b/nodes/fsn2/systemd-networkd/dn42i2.netdev index c1f5751..e745987 100644 --- a/nodes/fsn2/systemd-networkd/dn42i2.netdev +++ b/nodes/fsn2/systemd-networkd/dn42i2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = PlMza8PC6N58vpGqMsBo3UjvjXThl/2WCTK6drjqbgY= Endpoint = nbg1.dn42.zotan.network:40003 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn2/systemd-networkd/dn42i3.netdev b/nodes/fsn2/systemd-networkd/dn42i3.netdev index 1ec29d8..ae1c244 100644 --- a/nodes/fsn2/systemd-networkd/dn42i3.netdev +++ b/nodes/fsn2/systemd-networkd/dn42i3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = B+3QYRU5UqaWYAsKMfyk7wqDzsFZ31RluCakeXEVm2E= Endpoint = hel1.dn42.zotan.network:40003 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/bird2/bird/peers/AS4242421588_tech9.conf b/nodes/hel1/bird2/bird/peers/AS4242421588_tech9.conf new file mode 100644 index 0000000..9cb0d29 --- /dev/null +++ b/nodes/hel1/bird2/bird/peers/AS4242421588_tech9.conf @@ -0,0 +1,7 @@ +protocol bgp AS4242421588_tech9 from dnpeers { + neighbor 172.20.16.141 as 4242421588; +} + +protocol bgp AS4242421588_tech9_v6 from dnpeers { + neighbor fe80::1588%dn42p2 as 4242421588; +} diff --git a/nodes/hel1/systemd-networkd/dn42i1.netdev b/nodes/hel1/systemd-networkd/dn42i1.netdev index 00329a8..57a9582 100644 --- a/nodes/hel1/systemd-networkd/dn42i1.netdev +++ b/nodes/hel1/systemd-networkd/dn42i1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = F3gqp7BZaIXgVjB1KM4ausbAgO0jnwlZwuUtEgj0RRo= Endpoint = fsn1.dn42.zotan.network:40002 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42i2.netdev b/nodes/hel1/systemd-networkd/dn42i2.netdev index 7c391fa..d24226e 100644 --- a/nodes/hel1/systemd-networkd/dn42i2.netdev +++ b/nodes/hel1/systemd-networkd/dn42i2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = PlMza8PC6N58vpGqMsBo3UjvjXThl/2WCTK6drjqbgY= Endpoint = nbg1.dn42.zotan.network:40002 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42i3.netdev b/nodes/hel1/systemd-networkd/dn42i3.netdev index cee519e..8fc4cef 100644 --- a/nodes/hel1/systemd-networkd/dn42i3.netdev +++ b/nodes/hel1/systemd-networkd/dn42i3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = s7Fo3iH24V6lpZ6rYFE3U5bK0y9nwbhQzdYI8B4hvV0= Endpoint = fsn2.dn42.zotan.network:40003 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42p1.netdev b/nodes/hel1/systemd-networkd/dn42p1.netdev index ff7aa2e..bfb310b 100644 --- a/nodes/hel1/systemd-networkd/dn42p1.netdev +++ b/nodes/hel1/systemd-networkd/dn42p1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = CsXK/SE+c9vzX69tX1spr7KEounusQm+AojRom+cdy8= Endpoint = dn42-de-fsn1.doxz.net:51825 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42p2.netdev b/nodes/hel1/systemd-networkd/dn42p2.netdev new file mode 100644 index 0000000..dfbca02 --- /dev/null +++ b/nodes/hel1/systemd-networkd/dn42p2.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p2 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42422 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = MD1EdVe9a0yycUdXCH3A61s3HhlDn17m5d07e4H33S0= +Endpoint = de-fra02.dn42.tech9.io:55704 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42p2.network b/nodes/hel1/systemd-networkd/dn42p2.network new file mode 100644 index 0000000..732f8ea --- /dev/null +++ b/nodes/hel1/systemd-networkd/dn42p2.network @@ -0,0 +1,10 @@ +[Match] +Name = dn42p2 + +[Address] +Address = 172.20.177.35/32 +Peer = 172.20.16.141/32 + +[Address] +Address = fe80::100/128 +Peer = fe80::1588/128 diff --git a/nodes/nbg1/bird2/bird/peers/AS4242421588_tech9.conf b/nodes/nbg1/bird2/bird/peers/AS4242421588_tech9.conf new file mode 100644 index 0000000..d2003c4 --- /dev/null +++ b/nodes/nbg1/bird2/bird/peers/AS4242421588_tech9.conf @@ -0,0 +1,7 @@ +protocol bgp AS4242421588_tech9 from dnpeers { + neighbor 172.20.16.141 as 4242421588; +} + +protocol bgp AS4242421588_tech9_v6 from dnpeers { + neighbor fe80::1588%dn42p4 as 4242421588; +} diff --git a/nodes/nbg1/systemd-networkd/dn42i1.netdev b/nodes/nbg1/systemd-networkd/dn42i1.netdev index 746b765..15ee02c 100644 --- a/nodes/nbg1/systemd-networkd/dn42i1.netdev +++ b/nodes/nbg1/systemd-networkd/dn42i1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = F3gqp7BZaIXgVjB1KM4ausbAgO0jnwlZwuUtEgj0RRo= Endpoint = fsn1.dn42.zotan.network:40001 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42i2.netdev b/nodes/nbg1/systemd-networkd/dn42i2.netdev index aa13208..0e28993 100644 --- a/nodes/nbg1/systemd-networkd/dn42i2.netdev +++ b/nodes/nbg1/systemd-networkd/dn42i2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = B+3QYRU5UqaWYAsKMfyk7wqDzsFZ31RluCakeXEVm2E= Endpoint = hel1.dn42.zotan.network:40002 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42i3.netdev b/nodes/nbg1/systemd-networkd/dn42i3.netdev index 483a6a7..6e7888a 100644 --- a/nodes/nbg1/systemd-networkd/dn42i3.netdev +++ b/nodes/nbg1/systemd-networkd/dn42i3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = s7Fo3iH24V6lpZ6rYFE3U5bK0y9nwbhQzdYI8B4hvV0= Endpoint = fsn2.dn42.zotan.network:40002 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p1.netdev b/nodes/nbg1/systemd-networkd/dn42p1.netdev index 22b03f0..7095cc0 100644 --- a/nodes/nbg1/systemd-networkd/dn42p1.netdev +++ b/nodes/nbg1/systemd-networkd/dn42p1.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = 9FIP8l3qBoimwWyeHBIBHqyJuzdPRn1JXU7FYCKg93Y= Endpoint = fr-par01.dn42.munsternet.eu:51849 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p2.netdev b/nodes/nbg1/systemd-networkd/dn42p2.netdev index 6b95009..ad74ce4 100644 --- a/nodes/nbg1/systemd-networkd/dn42p2.netdev +++ b/nodes/nbg1/systemd-networkd/dn42p2.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = B1xSG/XTJRLd+GrWDsB06BqnIq8Xud93YVh/LYYYtUY= Endpoint = de2.g-load.eu:22341 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p3.netdev b/nodes/nbg1/systemd-networkd/dn42p3.netdev index 5db90a4..06099fa 100644 --- a/nodes/nbg1/systemd-networkd/dn42p3.netdev +++ b/nodes/nbg1/systemd-networkd/dn42p3.netdev @@ -10,4 +10,4 @@ PrivateKeyFile = /etc/wireguard/private.key [WireGuardPeer] PublicKey = r0B2r7XcpplqtrbIvnKGUvarvfe15qS9Qrd4bg5Bwyw= Endpoint = dn42-de01.weiti.org:22341 -AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p4.netdev b/nodes/nbg1/systemd-networkd/dn42p4.netdev new file mode 100644 index 0000000..19a3a5b --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p4.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p4 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42424 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = MD1EdVe9a0yycUdXCH3A61s3HhlDn17m5d07e4H33S0= +Endpoint = de-fra02.dn42.tech9.io:52419 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p4.network b/nodes/nbg1/systemd-networkd/dn42p4.network new file mode 100644 index 0000000..86c03e0 --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p4.network @@ -0,0 +1,10 @@ +[Match] +Name = dn42p4 + +[Address] +Address = 172.20.177.34/32 +Peer = 172.20.16.141/32 + +[Address] +Address = fe80::100/128 +Peer = fe80::1588/128