diff --git a/ext-peer.netdev.j2 b/ext-peer.netdev.j2 index 04f3479..0db74f6 100644 --- a/ext-peer.netdev.j2 +++ b/ext-peer.netdev.j2 @@ -4,7 +4,11 @@ Kind=wireguard Description=DN42 peering with AS{{ item.asn }} @ {% if item.remotehost is defined %}{{ item.remotehost }}[{{ item.remoteip }}]:{{ item.remoteport }}{% else %}[{{ item.remoteip }}]:{{ item.remoteport }}{% endif %} [WireGuard] +{% if item.keypath is defined %} +PrivateKeyFile={{ item.keypath }} +{% else %} PrivateKeyFile=/etc/systemd/network/wg.key +{% endif %} {% if item['localport'] is defined %} ListenPort={{ item['localport'] }} {% endif %} @@ -19,3 +23,6 @@ Endpoint={{ item['remoteip'] }}:{{ item['remoteport'] }} PublicKey={{ item['publickey'] }} PersistentKeepalive=15 AllowedIPs=fe80::/64 fd00::/8 172.20.0.0/14 172.31.0.0/16 10.0.0.0/8 +{% if item.pskpath is defined %} +PresharedKeyFile={{ item.pskpath }} +{% endif %} diff --git a/peerings/kix.yaml b/peerings/kix.yaml index 257a4d7..1697091 100644 --- a/peerings/kix.yaml +++ b/peerings/kix.yaml @@ -7,3 +7,49 @@ peers: remoteport: 32002 publickey: PfhGU0DMRu5Wnf0JfNQnnOWpyiqNjZ+wUCG2p6zwui8= remote_llv6: fe80::157 + - remotename: lare + asn: 4242423035 + remotehost: use2.dn42.lare.cc + remoteip: 198.23.146.188 + remoteport: 22002 + publickey: AREskFoxP2cd6DXoJ7druDsiWKX+8TwrkQqfi4JxRRw= + remote_llv6: fe80::3035:137 + - remotename: jlu5 + asn: 4242421080 + remotehost: chi.peer.highdef.network + remoteip: 64.44.131.204 + remoteport: 22002 + publickey: u4WJMAoCHIOeh/+6NWMytNygp+/wrMogB+rwyVzXoEg= + remote_llv6: fe80::113 +# copied from us2 + llv6: fe80::2002:2 + keypath: /etc/systemd/network/jlu5.key + - remotename: kioubit + asn: 4242423914 + remotehost: us2.g-load.eu + remoteip: 170.205.37.115 + remoteport: 22002 + publickey: 6Cylr9h1xFduAO+5nyXhFI1XJ0+Sw9jCpCDvcqErF1s= + remote_llv6: fe80::ade0 + - remotename: whojk + asn: 4242422717 + remotehost: use.vm.whojk.com + remoteip: 46.233.45.53 + remoteport: 23336 + publickey: 1LJ2PBEUOa7uwqnHS3j2EGVW+wKv/d1L6mbnA0tOjU0= + pskpath: /etc/systemd/network/whojk.psk + remote_llv6: fe80::2717 + - remotename: burble + asn: 4242422601 + remotehost: dn42-us-nyc1.burble.com + remoteip: 109.205.61.36 + remoteport: 22002 + publickey: DJcXWCpribeS+rJ5V/koZW7M6nLdSx5DR4WdOfsm/lA= + remote_llv6: fe80::42:2601:29:1 + - remotename: routedbits + asn: 4242420207 + remotehost: router.chi1.routedbits.com + remoteip: 172.232.2.238 + remoteport: 52002 + publickey: 89xUzROs3l/KNPLxDTJz4l5aEH1cmLb22bNgChhRiQo= + remote_llv6: fe80::207 diff --git a/peerings/uk1.yaml b/peerings/uk1.yaml index c37b40b..7071950 100644 --- a/peerings/uk1.yaml +++ b/peerings/uk1.yaml @@ -87,3 +87,56 @@ peers: remoteport: 22002 publickey: /YgOAbhTqrbsXBF0idVWPqmDlvQobG0f9nYiy6OscEE= remote_llv6: fe80::116 + - remotename: maraun + asn: 4242422225 + remotehost: unknown-remote-hostname + remoteip: 37.120.175.249 + remoteport: 22002 + publickey: uS1AYe7zTGAP48XeNn0vppNjg7q0hawyh8Y0bvvAWhk= + remote_llv6: fe80::2225 + - remotename: whojk + asn: 4242422717 + remotehost: de.vm.whojk.com + remoteip: 213.232.114.160 + remoteport: 24044 + publickey: rS+EVSpHhBW7nXv0m/Vw2I/tujwZUEyxZmV51k7Wkzw= + remote_llv6: fe80::2717 + pskpath: /etc/systemd/network/whojk.psk + - remotename: tech9 + asn: 4242421588 + remotehost: nl-ams01.dn42.tech9.io + remoteip: 45.76.36.19 + remoteport: 53809 + publickey: opEMCeB+Zepf/lMabVndWVOmKVHI3Bvc98hm55TAxGI= + remote_llv6: fe80::1588 + enh: false + remote_unicastv4: 172.23.220.192 + llv6: fe80::100 + - remotename: canidae + asn: 4242421440 + remotehost: sco1.dn42.canidae.systems + remoteip: 137.220.116.235 + remoteport: 26008 + publickey: QzxlF+dfaU9U6f+v7MUiCL+ey5V0sT2947wiYSn8/g4= + remote_llv6: fe80::1440:2002 +# TODO +# - remotename: androw +# asn: 4242422575 +# remotehost: par2-fr.androw.eu +# remoteip: 45.90.160.129 +# remoteport: 22002 +# localport: 22575 + - remotename: routedbits + asn: 4242420207 + remotehost: router.lon1.routedbits.com + remoteip: 139.162.229.72 + remoteport: 52002 + publickey: vlqNoUSJ4T2sORBHusdwr9rCtQfdsIJvjV3Y/qBUcgY= + remote_llv6: fe80::207 + - remotename: cdubs + asn: 4242420566 + remotehost: DN11.uk.surgebytes.com + remoteip: 207.2.121.31 + remoteport: 32002 + publickey: zv3W8vQqexOgbtntVyDYZt3+a8yHBpI3dP1+XCXz1yA= + remote_llv6: fe80::566:11 diff --git a/peerings/us1.yaml b/peerings/us1.yaml index cdef829..f66b9b6 100644 --- a/peerings/us1.yaml +++ b/peerings/us1.yaml @@ -17,3 +17,10 @@ peers: enh: false remote_unicastv4: 172.20.16.140 llv6: fe80::100 + - remotename: routedbits + asn: 4242420207 + remotehost: router.dal1.routedbits.com + remoteip: 104.200.19.98 + remoteport: 52002 + publickey: 8clbJPxK5ylOhFDNGdn/CL5zRWQdf7rXbLeF7j8czFI= + remote_llv6: fe80::207 diff --git a/peerings/us2.yaml b/peerings/us2.yaml new file mode 100644 index 0000000..88ef13d --- /dev/null +++ b/peerings/us2.yaml @@ -0,0 +1,9 @@ +--- +peers: + - remotename: routedbits + asn: 4242420207 + remotehost: router.iad1.routedbits.com + remoteip: 139.144.202.43 + remoteport: 52002 + publickey: /RLM4EcF8b7FKKcxnvHIYyDoES59HXIBqhKEWt4yRy0= + remote_llv6: fe80::207 diff --git a/peerings/us3.yaml b/peerings/us3.yaml index 83b9789..92f55f6 100644 --- a/peerings/us3.yaml +++ b/peerings/us3.yaml @@ -21,3 +21,69 @@ peers: remoteport: 22002 publickey: lAs/L2XLEZALnTOJ6ZhHaKgYY+rzqRgPnmlC4v/SfQw= remote_llv6: fe80::1888 + - remotename: jlu5 + asn: 4242421080 + remotehost: sjc.peer.highdef.network + remoteip: 173.249.207.11 + remoteport: 22002 + publickey: Kz7mZN2ACCXSFKMiZDIVdVRmEPSnVfbEOqsxsDZ6hAw= + remote_llv6: fe80::1080:34 + - remotename: lare + asn: 4242423035 + remotehost: usw3.dn42.lare.cc + remoteip: 194.48.154.3 + remoteport: 22002 + publickey: oWMjftHTU+ll9PG26adiQaipQ8HC6kO4puXGakw38j8= + remote_llv6: fe80::3035:139 + - remotename: sun + asn: 4242423088 + remotehost: lax1-us.dn42.6700.cc + remoteip: 66.103.206.209 + remoteport: 22002 + publickey: QSAeFPotqFpF6fFe3CMrMjrpS5AL54AxWY2w1+Ot2Bo= + remote_llv6: fe80::3088:193 + - remotename: kuu + asn: 4242422189 + remotehost: us-lax.dn42.kuu.moe + remoteip: 45.15.143.198 + remoteport: 41498 + publickey: DIw4TKAQelurK10Sh1qE6IiDKTqL1yciI5ItwBgcHFA= + remote_llv6: fe80::2189:ef + - remotename: kioubit + asn: 4242423914 + remotehost: us3.g-load.eu + remoteip: 45.67.219.231 + remoteport: 22002 + publickey: sLbzTRr2gfLFb24NPzDOpy8j09Y6zI+a7NkeVMdVSR8= + remote_llv6: fe80::ade0 + - remotename: kskb + asn: 4242421817 + remotehost: 4.us.kskb.eu.org + remoteip: 208.99.48.123 + remoteport: 22002 + publickey: dZzVdXbQPnWPpHk8QfW/p+MfGzAkMBuWpxEIXzQCggY= + remote_llv6: fe80::1817 + pskpath: /etc/systemd/network/kskb.psk + - remotename: moe233 + asn: 4242420253 + remotehost: lv.dn42.moe233.net + remoteip: 205.185.117.85 + remoteport: 22002 + publickey: C3SneO68SmagisYQ3wi5tYI2R9g5xedKkB56Y7rtPUo= + remote_llv6: fe80::253 + pskpath: /etc/systemd/network/moe233.psk + - remotename: whojk + asn: 4242422717 + remotehost: usw.vm.whojk.com + remoteip: 45.15.143.191 + remoteport: 23139 + publickey: L4+efr10ZM0J80nDeO5mHw25nq9LC5UBrYtP8T1I9n4= + remote_llv6: fe80::2717 + pskpath: /etc/systemd/network/whojk.psk + - remotename: routedbits + asn: 4242420207 + remotehost: router.fnc1.routedbits.com + remoteip: 45.79.108.179 + remoteport: 52002 + publickey: yZvBa83e7ywrZearK1nuAL37gVY1vbVBWbRdIj7HVEo= + remote_llv6: fe80::207