From a0b4a95ad3de016ecd36069c7d446f8351c2f3cf Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sun, 5 Apr 2020 00:11:34 +0200 Subject: [PATCH] add peers --- .../fsn1/bird2/bird/peers/AS4242422227_waxman.conf | 7 +++++++ nodes/fsn1/netcheck.sh | 1 + nodes/fsn1/systemd-networkd/dn42p6.netdev | 13 +++++++++++++ nodes/fsn1/systemd-networkd/dn42p6.network | 10 ++++++++++ .../hel1/bird2/bird/peers/AS4242423078_hexanet.conf | 3 +++ nodes/hel1/netcheck.sh | 2 ++ nodes/hel1/systemd-networkd/dn42p3.netdev | 13 +++++++++++++ nodes/hel1/systemd-networkd/dn42p3.network | 6 ++++++ .../nbg1/bird2/bird/peers/AS4242422227_waxman.conf | 7 +++++++ .../nbg1/bird2/bird/peers/AS4242423078_hexanet.conf | 3 +++ nodes/nbg1/netcheck.sh | 3 +++ nodes/nbg1/systemd-networkd/dn42p5.netdev | 13 +++++++++++++ nodes/nbg1/systemd-networkd/dn42p5.network | 6 ++++++ nodes/nbg1/systemd-networkd/dn42p6.netdev | 13 +++++++++++++ nodes/nbg1/systemd-networkd/dn42p6.network | 10 ++++++++++ 15 files changed, 110 insertions(+) create mode 100644 nodes/fsn1/bird2/bird/peers/AS4242422227_waxman.conf create mode 100644 nodes/fsn1/systemd-networkd/dn42p6.netdev create mode 100644 nodes/fsn1/systemd-networkd/dn42p6.network create mode 100644 nodes/hel1/bird2/bird/peers/AS4242423078_hexanet.conf create mode 100644 nodes/hel1/systemd-networkd/dn42p3.netdev create mode 100644 nodes/hel1/systemd-networkd/dn42p3.network create mode 100644 nodes/nbg1/bird2/bird/peers/AS4242422227_waxman.conf create mode 100644 nodes/nbg1/bird2/bird/peers/AS4242423078_hexanet.conf create mode 100644 nodes/nbg1/systemd-networkd/dn42p5.netdev create mode 100644 nodes/nbg1/systemd-networkd/dn42p5.network create mode 100644 nodes/nbg1/systemd-networkd/dn42p6.netdev create mode 100644 nodes/nbg1/systemd-networkd/dn42p6.network diff --git a/nodes/fsn1/bird2/bird/peers/AS4242422227_waxman.conf b/nodes/fsn1/bird2/bird/peers/AS4242422227_waxman.conf new file mode 100644 index 0000000..e4af2b8 --- /dev/null +++ b/nodes/fsn1/bird2/bird/peers/AS4242422227_waxman.conf @@ -0,0 +1,7 @@ +protocol bgp AS4242422227_waxman from dnpeers { + neighbor 172.22.127.66 as 4242422227; +} + +protocol bgp AS4242422227_waxman_v6 from dnpeers { + neighbor fe80::42:22:200%dn42p6 as 4242422227; +} diff --git a/nodes/fsn1/netcheck.sh b/nodes/fsn1/netcheck.sh index 8337325..4d904de 100755 --- a/nodes/fsn1/netcheck.sh +++ b/nodes/fsn1/netcheck.sh @@ -143,6 +143,7 @@ pingtest "172.23.235.1" "fe80::1299:e%dn42p2" pingtest6 "fe80::42:2341:1%dn42p3" pingtest "172.20.129.169" "fe80::42:2601:31:1%dn42p4" pingtest "172.20.175.195" "fe80::42%dn42p5" +pingtest "172.22.127.66" "fe80::42:22:200%dn42p6" pingtest "172.20.177.34" "fdff:b02d:2ef7::3" pingtest "172.20.177.35" "fdff:b02d:2ef7::4" pingtest "172.20.177.36" "fdff:b02d:2ef7::5" diff --git a/nodes/fsn1/systemd-networkd/dn42p6.netdev b/nodes/fsn1/systemd-networkd/dn42p6.netdev new file mode 100644 index 0000000..4fb385b --- /dev/null +++ b/nodes/fsn1/systemd-networkd/dn42p6.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p6 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42426 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = /5zyOlKCY8YWDLVEFlWbLZQFsL6Qzvgbhl2o7LEEcCk= +Endpoint = dn42-de-fsn1dc8-1.wxmn.net:22341 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/fsn1/systemd-networkd/dn42p6.network b/nodes/fsn1/systemd-networkd/dn42p6.network new file mode 100644 index 0000000..b492a71 --- /dev/null +++ b/nodes/fsn1/systemd-networkd/dn42p6.network @@ -0,0 +1,10 @@ +[Match] +Name = dn42p6 + +[Address] +Address = 172.20.177.33/32 +Peer = 172.22.127.66/32 + +[Address] +Address = fe80::2342/128 +Peer = fe80::42:22:200/128 diff --git a/nodes/hel1/bird2/bird/peers/AS4242423078_hexanet.conf b/nodes/hel1/bird2/bird/peers/AS4242423078_hexanet.conf new file mode 100644 index 0000000..c969427 --- /dev/null +++ b/nodes/hel1/bird2/bird/peers/AS4242423078_hexanet.conf @@ -0,0 +1,3 @@ +protocol bgp AS4242423078_hexanet_v6 from dnpeers { + neighbor fe80::a:3621%dn42p3 as 4242423078; +} diff --git a/nodes/hel1/netcheck.sh b/nodes/hel1/netcheck.sh index 025b1a2..1b0451d 100755 --- a/nodes/hel1/netcheck.sh +++ b/nodes/hel1/netcheck.sh @@ -139,6 +139,8 @@ webtest(){ echo -e "[${GREEN}INFO${NC}]${GREY} Scan started on $(date "+%Y-%m-%d %H:%M:%S")${NC}" pingtest "172.22.159.62" "fdfc:694e:234f::affa" +pingtest "172.20.16.141" "fe80::1588%dn42p2" +pingtest6 "fe80::a:3621%dn42p3" pingtest "172.20.177.33" "fdff:b02d:2ef7::2" pingtest "172.20.177.34" "fdff:b02d:2ef7::3" pingtest "172.20.177.36" "fdff:b02d:2ef7::5" diff --git a/nodes/hel1/systemd-networkd/dn42p3.netdev b/nodes/hel1/systemd-networkd/dn42p3.netdev new file mode 100644 index 0000000..8d57fb3 --- /dev/null +++ b/nodes/hel1/systemd-networkd/dn42p3.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p3 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42423 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = UfaUP1Qxwflxk6Oa7dTZMAaCScq4b/jqWVN8vAVQclE= +Endpoint = 51.15.110.221:32341 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/hel1/systemd-networkd/dn42p3.network b/nodes/hel1/systemd-networkd/dn42p3.network new file mode 100644 index 0000000..a8871f9 --- /dev/null +++ b/nodes/hel1/systemd-networkd/dn42p3.network @@ -0,0 +1,6 @@ +[Match] +Name = dn42p3 + +[Address] +Address = fe80::4/128 +Peer = fe80::a:3621/128 diff --git a/nodes/nbg1/bird2/bird/peers/AS4242422227_waxman.conf b/nodes/nbg1/bird2/bird/peers/AS4242422227_waxman.conf new file mode 100644 index 0000000..af6e515 --- /dev/null +++ b/nodes/nbg1/bird2/bird/peers/AS4242422227_waxman.conf @@ -0,0 +1,7 @@ +protocol bgp AS4242422227_waxman from dnpeers { + neighbor 172.22.127.65 as 4242422227; +} + +protocol bgp AS4242422227_waxman_v6 from dnpeers { + neighbor fe80::42:22:100%dn42p6 as 4242422227; +} diff --git a/nodes/nbg1/bird2/bird/peers/AS4242423078_hexanet.conf b/nodes/nbg1/bird2/bird/peers/AS4242423078_hexanet.conf new file mode 100644 index 0000000..9b4846a --- /dev/null +++ b/nodes/nbg1/bird2/bird/peers/AS4242423078_hexanet.conf @@ -0,0 +1,3 @@ +protocol bgp AS4242423078_hexanet_v6 from dnpeers { + neighbor fe80::b:3621%dn42p5 as 4242423078; +} diff --git a/nodes/nbg1/netcheck.sh b/nodes/nbg1/netcheck.sh index 47994a2..a6726b1 100755 --- a/nodes/nbg1/netcheck.sh +++ b/nodes/nbg1/netcheck.sh @@ -141,6 +141,9 @@ echo -e "[${GREEN}INFO${NC}]${GREY} Scan started on $(date "+%Y-%m-%d %H:%M:%S") pingtest6 "fe80::42:2341:2%dn42p1" pingtest "172.20.53.97" "fe80::ade0%dn42p2" pingtest "172.20.175.193" "fe80::42%dn42p3" +pingtest "172.20.16.141" "fe80::1588%dn42p4" +pingtest6 "fe80::b:3621%dn42p5" +pingtest "172.22.127.65" "fe80::42:22:100%dn42p6" pingtest "172.20.177.33" "fdff:b02d:2ef7::2" pingtest "172.20.177.35" "fdff:b02d:2ef7::4" pingtest "172.20.177.36" "fdff:b02d:2ef7::5" diff --git a/nodes/nbg1/systemd-networkd/dn42p5.netdev b/nodes/nbg1/systemd-networkd/dn42p5.netdev new file mode 100644 index 0000000..596bccb --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p5.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p5 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42425 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = iWgICy7Sr/nUfUwJOHziEDhYIi7ujxBJqE5ozCWjMQE= +Endpoint = 163.172.159.67:32341 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p5.network b/nodes/nbg1/systemd-networkd/dn42p5.network new file mode 100644 index 0000000..069913a --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p5.network @@ -0,0 +1,6 @@ +[Match] +Name = dn42p5 + +[Address] +Address = fe80::3/128 +Peer = fe80::b:3621/128 diff --git a/nodes/nbg1/systemd-networkd/dn42p6.netdev b/nodes/nbg1/systemd-networkd/dn42p6.netdev new file mode 100644 index 0000000..f11499a --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p6.netdev @@ -0,0 +1,13 @@ +[NetDev] +Name = dn42p6 +Kind = wireguard +Description = WireGuard + +[WireGuard] +ListenPort = 42426 +PrivateKeyFile = /etc/wireguard/private.key + +[WireGuardPeer] +PublicKey = vGCeRU6R30upXKt6OThbc/+ALvvoAaog190JLSrcHXo= +Endpoint = dn42-de-fkb-1.wxmn.net:22341 +AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8 diff --git a/nodes/nbg1/systemd-networkd/dn42p6.network b/nodes/nbg1/systemd-networkd/dn42p6.network new file mode 100644 index 0000000..fec749e --- /dev/null +++ b/nodes/nbg1/systemd-networkd/dn42p6.network @@ -0,0 +1,10 @@ +[Match] +Name = dn42p6 + +[Address] +Address = 172.20.177.34/32 +Peer = 172.22.127.65/32 + +[Address] +Address = fe80::3/128 +Peer = fe80::42:22:100/128