From 43d8830ad37a7b82ee035e00b98c734a70777c98 Mon Sep 17 00:00:00 2001 From: 9pfs <9pfs@amcforum.wiki> Date: Wed, 25 Dec 2024 01:43:27 -0800 Subject: [PATCH] more peerings --- ext-peer.bgp.conf.j2 | 10 ++++-- ext-peer.netdev.j2 | 1 + ext-peer.network.j2 | 1 + peerings.yml | 7 ++-- peerings/kix.yaml | 1 - peerings/uk1.yaml | 81 +++++++++++++++++++++++++++++++++++++++++++- peerings/us1.yaml | 3 +- peerings/us2.yaml | 10 ------ peerings/us3.yaml | 9 +++-- 9 files changed, 103 insertions(+), 20 deletions(-) delete mode 100644 peerings/us2.yaml diff --git a/ext-peer.bgp.conf.j2 b/ext-peer.bgp.conf.j2 index d05fb09..426156a 100644 --- a/ext-peer.bgp.conf.j2 +++ b/ext-peer.bgp.conf.j2 @@ -1,7 +1,13 @@ protocol bgp dn42_{{ item['remotename'] }} from dnpeers { neighbor {{ item['remote_llv6'] }} % 'dn42{{ item['remotename'] }}' as {{ item['asn'] }}; -{% if item['needs_v4'] is defined %} -{% if item['remote_unicastv4'] is not defined %} +{% if item.extmsg|default(true) %} + enable extended messages on; +{% endif %} +{% if item.hostadv|default(true) %} + advertise hostname on; +{% endif %} +{% if item['needs_v4']|default(true) %} +{% if item['enh']|default(true) %} ipv4 { extended next hop on; }; diff --git a/ext-peer.netdev.j2 b/ext-peer.netdev.j2 index 41e57bd..04f3479 100644 --- a/ext-peer.netdev.j2 +++ b/ext-peer.netdev.j2 @@ -1,6 +1,7 @@ [NetDev] Name=dn42{{ item['remotename'] }} 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] PrivateKeyFile=/etc/systemd/network/wg.key diff --git a/ext-peer.network.j2 b/ext-peer.network.j2 index 67cbba2..b145dd1 100644 --- a/ext-peer.network.j2 +++ b/ext-peer.network.j2 @@ -7,6 +7,7 @@ IPv6AcceptRA=false IPv4Forwarding=true IPv6Forwarding=true KeepConfiguration=true +Description=DN42 peering with AS{{ item.asn }} @ {% if item.remotehost is defined %}{{ item.remotehost }}[{{ item.remoteip }}]:{{ item.remoteport }}{% else %}[{{ item.remoteip }}]:{{ item.remoteport }}{% endif %} [Address] {% if item['llv6'] is defined %} diff --git a/peerings.yml b/peerings.yml index d0dcaa4..c8d164d 100644 --- a/peerings.yml +++ b/peerings.yml @@ -32,8 +32,11 @@ - name: Reload systemd-networkd ansible.builtin.command: networkctl reload when: peers is defined - - name: Reload bird + - name: Make sure bird is running ansible.builtin.systemd_service: name: bird.service - state: reloaded + state: started + when: peers is defined + - name: Reload bird + ansible.builtin.command: birdc configure when: peers is defined diff --git a/peerings/kix.yaml b/peerings/kix.yaml index 913ac48..257a4d7 100644 --- a/peerings/kix.yaml +++ b/peerings/kix.yaml @@ -7,4 +7,3 @@ peers: remoteport: 32002 publickey: PfhGU0DMRu5Wnf0JfNQnnOWpyiqNjZ+wUCG2p6zwui8= remote_llv6: fe80::157 - needs_v4: true diff --git a/peerings/uk1.yaml b/peerings/uk1.yaml index ec12cbe..c37b40b 100644 --- a/peerings/uk1.yaml +++ b/peerings/uk1.yaml @@ -7,4 +7,83 @@ peers: remoteport: 32002 publickey: HwnW9T5AgETDfPi4EqExeBzi0j6EeKEV/M5Nb0iUQEU= remote_llv6: fe80::157 - needs_v4: true + - remotename: lare + asn: 4242423035 + remotehost: uk01.dn42.lare.cc + remoteip: 213.255.246.183 + remoteport: 22002 + publickey: RJaU1kRfiOREvKihiDMFpNrEGpN8td3z+UvHxabOlR0= + remote_llv6: fe80::3035:138 + - remotename: alemal + asn: 4242421525 + remotehost: uk1.alemal.se + remoteip: 194.29.101.80 + remoteport: 52002 + publickey: 1JwYl6O6Y94PiKe5dXcgwMYjDxRK3im8mqvbZIeMSDE= + remote_llv6: fe80::ade1 + - remotename: burble + asn: 4242422601 + remotehost: dn42-us-lon1.burble.com + remoteip: 45.91.93.104 + remoteport: 22002 + publickey: lXe22f1khHJANaPHZqmnwy3MWtWvS7PBmaM/+f8IPWM= + remote_llv6: fe80::42:2601:35:1 + - remotename: as215887 + asn: 4242421732 + remotehost: chr-lo01.as215887.net + remoteip: 45.134.88.134 + remoteport: 22002 + publickey: qe7bmJgd2ftxE9OYPL6Q4gZK6lvSqKPn5BynDXHsvzM= + remote_llv6: fe80::1732 + enh: false + remote_unicastv4: 172.23.32.128 + localport: 21732 + - remotename: catgirls + asn: 4242421411 + remotehost: frog.catgirls.systems + remoteip: 116.202.10.127 + remoteport: 22002 + publickey: WRLb7YL7JQ55dkI1HZ4KoMRxX4vDJF61xQWgocGgzGI= + remote_llv6: fe80::1411:1 + - remotename: dimaguy + asn: 4242421367 + remotehost: seerhq.linkpuff.me + remoteip: 143.47.50.55 + remoteport: 51821 + publickey: 2vuH7mKzpvNpgZqybpIm47typxgejXHOnuXhOrp8uXI= + remote_llv6: fe80::dead:b055 + - remotename: kuu + asn: 4242422189 + remotehost: de-fra.dn42.kuu.moe + remoteip: 193.226.77.212 + remoteport: 50720 + publickey: FHp0OR4UpAS8/Ra0FUNffTk18soUYCa6NcvZdOgxY0k= + remote_llv6: fe80::2189:e9 + - remotename: jlu5 + asn: 4242421080 + remotehost: lon.peer.highdef.network + remoteip: 194.29.101.119 + remoteport: 22002 + publickey: pEQZQOD67QeWXqrHLrMoCXug/cOXJFMXH5vwQ1cW70s= + remote_llv6: fe80::116 + - remotename: nest + asn: 4242420392 + remotehost: hackclub.app + remoteip: 37.27.51.34 + remoteport: 52002 + publickey: BOI9J1hyFwlbjatNi9NUUMVnRXSOwBpb0f+Cgwl4p28= + remote_llv6: fe80::392 + - remotename: kioubit + asn: 4242423914 + remotehost: uk1.g-load.eu + remoteip: 194.29.101.166 + remoteport: 22002 + publickey: sLbzTRr2gfLFb24NPzDOpy8j09Y6zI+a7NkeVMdVSR8= + remote_llv6: fe80::ade0 + - remotename: hpg + asn: 4242420965 + remotehost: buh.ro.dn42.hpg.nz + remoteip: 31.14.40.192 + remoteport: 22002 + publickey: /YgOAbhTqrbsXBF0idVWPqmDlvQobG0f9nYiy6OscEE= + remote_llv6: fe80::116 diff --git a/peerings/us1.yaml b/peerings/us1.yaml index 3cffc3c..cdef829 100644 --- a/peerings/us1.yaml +++ b/peerings/us1.yaml @@ -7,7 +7,6 @@ peers: remoteport: 22002 publickey: uVIBY5keaBLtkT7oyD/W/TgEBiXerr/IPxtH+JO0amI= remote_llv6: fe80::1888 - needs_v4: true - remotename: tech9 asn: 4242421588 remotehost: us-dal01.dn42.tech9.io @@ -15,6 +14,6 @@ peers: remoteport: 52718 publickey: iEZ71NPZge6wHKb6q4o2cvCopZ7PBDqn/b3FO56+Hkc= remote_llv6: fe80::1588 + enh: false remote_unicastv4: 172.20.16.140 - needs_v4: true llv6: fe80::100 diff --git a/peerings/us2.yaml b/peerings/us2.yaml deleted file mode 100644 index d7a18eb..0000000 --- a/peerings/us2.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -peers: - - remotename: imlonghao - asn: 4242421888 - remotehost: us2.dn42.ni.sb - remoteip: 199.19.224.106 - remoteport: 22002 - publickey: lAs/L2XLEZALnTOJ6ZhHaKgYY+rzqRgPnmlC4v/SfQw= - remote_llv6: fe80::1888 - needs_v4: true diff --git a/peerings/us3.yaml b/peerings/us3.yaml index d403524..83b9789 100644 --- a/peerings/us3.yaml +++ b/peerings/us3.yaml @@ -7,7 +7,6 @@ peers: remoteport: 22002 publickey: fB7pARKre69fDEyFxl4Jx314UPtk5b5TRaYEqwH+3G8= remote_llv6: fe80::42:2601:2a:1 - needs_v4: true - remotename: ibj asn: 4242420157 remotehost: unknown-remote-hostname @@ -15,4 +14,10 @@ peers: remoteport: 32002 publickey: sl9vN6wmKuB3aGjBYx2ukjABc66EAn0p5VJsg0XjjjM= remote_llv6: fe80::157 - needs_v4: true + - remotename: imlonghao + asn: 4242421888 + remotehost: us2.dn42.ni.sb + remoteip: 199.19.224.106 + remoteport: 22002 + publickey: lAs/L2XLEZALnTOJ6ZhHaKgYY+rzqRgPnmlC4v/SfQw= + remote_llv6: fe80::1888