diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 6c34909..6f469f7 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -492,61 +492,63 @@ hosts-inet6: stats: 2a02:8106:208:5282:2:0:0:3 radius: 2a02:8106:208:5282:2:0:0:4 zeit: 2a02:8106:208:5282:2:0:0:5 - pub: - pub-gw: 2a02:8106:208:5283::1 - priv1: - priv1-gw: 2a02:8106:208:52c0::1 - priv2: - priv2-gw: 2a02:8106:208:52c1::1 - priv3: - priv3-gw: 2a02:8106:208:52c2::1 - priv4: - priv4-gw: 2a02:8106:208:52c3::1 - priv5: - priv5-gw: 2a02:8106:208:52c4::1 - priv6: - priv6-gw: 2a02:8106:208:52c5::1 - priv7: - priv7-gw: 2a02:8106:208:52c6::1 - priv8: - priv8-gw: 2a02:8106:208:52c7::1 - priv9: - priv9-gw: 2a02:8106:208:52c8::1 - priv10: - priv10-gw: 2a02:8106:208:52c9::1 - priv11: - priv11-gw: 2a02:8106:208:52ca::1 - priv12: - priv12-gw: 2a02:8106:208:52cb::1 - priv13: - priv13-gw: 2a02:8106:208:52cc::1 - priv14: - priv14-gw: 2a02:8106:208:52cd::1 - priv15: - priv15-gw: 2a02:8106:208:52ce::1 - priv16: - priv16-gw: 2a02:8106:208:52cf::1 - priv17: - priv17-gw: 2a02:8106:208:52d0::1 - priv18: - priv18-gw: 2a02:8106:208:52d1::1 - priv19: - priv19-gw: 2a02:8106:208:52d2::1 - priv20: - priv20-gw: 2a02:8106:208:52d3::1 - priv21: - priv21-gw: 2a02:8106:208:52d4::1 - priv22: - priv22-gw: 2a02:8106:208:52d5::1 - priv23: - priv23-gw: 2a02:8106:208:52d6::1 - priv24: - priv24-gw: 2a02:8106:208:52d7::1 - - radio: - radio-gw: 2a02:8106:208:5286::1 c3d2: c3d2-anon: 2a02:8106:208:5201::c3d2:1 c3d2-gw: 2a02:8106:208:5201::c3d2:4 bgp: 2a02:8106:208:5201::c3d2:ff0b + + up2: + pub: + pub-gw: 2a02:8106:211:e983::1 + radio: + radio-gw: 2a02:8106:208:5286::1 + + priv1: + priv1-gw: 2a02:8106:211:e9c0::1 + priv2: + priv2-gw: 2a02:8106:211:e9c1::1 + priv3: + priv3-gw: 2a02:8106:211:e9c2::1 + priv4: + priv4-gw: 2a02:8106:211:e9c3::1 + priv5: + priv5-gw: 2a02:8106:211:e9c4::1 + priv6: + priv6-gw: 2a02:8106:211:e9c5::1 + priv7: + priv7-gw: 2a02:8106:211:e9c6::1 + priv8: + priv8-gw: 2a02:8106:211:e9c7::1 + priv9: + priv9-gw: 2a02:8106:211:e9c8::1 + priv10: + priv10-gw: 2a02:8106:211:e9c9::1 + priv11: + priv11-gw: 2a02:8106:211:e9ca::1 + priv12: + priv12-gw: 2a02:8106:211:e9cb::1 + priv13: + priv13-gw: 2a02:8106:211:e9cc::1 + priv14: + priv14-gw: 2a02:8106:211:e9cd::1 + priv15: + priv15-gw: 2a02:8106:211:e9ce::1 + priv16: + priv16-gw: 2a02:8106:211:e9cf::1 + priv17: + priv17-gw: 2a02:8106:211:e9d0::1 + priv18: + priv18-gw: 2a02:8106:211:e9d1::1 + priv19: + priv19-gw: 2a02:8106:211:e9d2::1 + priv20: + priv20-gw: 2a02:8106:211:e9d3::1 + priv21: + priv21-gw: 2a02:8106:211:e9d4::1 + priv22: + priv22-gw: 2a02:8106:211:e9d5::1 + priv23: + priv23-gw: 2a02:8106:211:e9d6::1 + priv24: + priv24-gw: 2a02:8106:211:e9d7::1 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index c6d3fa4..965c344 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -67,6 +67,7 @@ subnets-inet6: c3d2: 2a02:8106:208:5201::/64 core: 2a02:8106:208:5281::/64 serv: 2a02:8106:208:5282::/64 + up2: pub: 2a02:8106:208:5283::/64 radio: 2a02:8106:208:5286::/64 priv1: 2a02:8106:208:52c0::/64 diff --git a/salt/bird/bird6.conf b/salt/bird/bird6.conf index 927e43a..6b4d625 100644 --- a/salt/bird/bird6.conf +++ b/salt/bird/bird6.conf @@ -58,6 +58,7 @@ protocol ospf ZW6 { networks { fd23:42:c3d2:500::/56; 2a02:8106:208:5200::/56; + 2a02:8106:211:e900::/56; }; {%- for iface, ips in salt['grains.get']('ip_interfaces').items() %} {%- if iface == 'core' or iface == 'br-core' %} @@ -83,9 +84,10 @@ protocol ospf ZW6 { {%- if pillar.get('bgp') %} protocol static { # Zentralwerk DN42 - route fd23:42:c3d2:580::/57 unreachable; + route fd23:42:c3d2:580::/56 unreachable; # Static Kabeldeutschland route 2a02:8106:208:5280::/57 unreachable; + route 2a02:8106:211:e900::/56 unreachable; } protocol bgp { diff --git a/salt/unbound/listen.conf b/salt/unbound/listen.conf index 3ed5a99..a55d8b7 100644 --- a/salt/unbound/listen.conf +++ b/salt/unbound/listen.conf @@ -9,6 +9,7 @@ server: interface: :: access-control: fd23:42:c3d2:500::/56 allow access-control: 2a02:8106:208:5200::/56 allow + access-control: 2a02:8106:211:e900::/56 allow access-control: ::172.20.72.0/117 allow access-control: ::172.22.99.0/120 allow access-control: ::1/128 allow diff --git a/subnets.md b/subnets.md index 58b1038..799e9d0 100644 --- a/subnets.md +++ b/subnets.md @@ -68,40 +68,36 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * fd23:42:c3d2:5cf::/64 PRIV16 * […] PRIV24 -## Tunnelbroker.net - -* 2001:470:1f0b:12b1::/64 -* 2001:470:77fb::/48 - # Peer C3D2: * 172.22.99.0/24 -* 2001:470:6d:670::/64 ## Vodafone fixed IPv4 -* 24.134.104.53 +* 24.134.104.53 (up1) +* 24.134.252.105 (up2) ## Vodafone fixed IPv6 -* 2a02:8106:208:5200::/56 +* 2a02:8106:208:5200::/56 (up1) * 2a02:8106:208:5201::/64 C3D2 - * 2a02:8106:208:5280::/57 ZW - * 2a02:8106:208:5281::/64 CORE - * 2a02:8106:208:5282::/64 SERV - * 2a02:8106:208:5283::/64 PUBLIC - * 2a02:8106:208:52c0::/64 PRIV1 - * 2a02:8106:208:52c1::/64 PRIV2 - * 2a02:8106:208:52c2::/64 PRIV3 - * 2a02:8106:208:52c3::/64 PRIV4 - * 2a02:8106:208:52c4::/64 PRIV5 - * 2a02:8106:208:52c5::/64 PRIV6 - * 2a02:8106:208:52c6::/64 PRIV7 - * 2a02:8106:208:52c7::/64 PRIV8 - * 2a02:8106:208:52c8::/64 PRIV9 - * 2a02:8106:208:52c9::/64 PRIV10 - * 2a02:8106:208:52ca::/64 PRIV11 - * 2a02:8106:208:52cb::/64 PRIV12 - * 2a02:8106:208:52cc::/64 PRIV13 - * 2a02:8106:208:52cd::/64 PRIV14 - * 2a02:8106:208:52ce::/64 PRIV15 - * 2a02:8106:208:52cf::/64 PRIV16 + * 2a02:8106:208:5281::/64 CORE + * 2a02:8106:208:5282::/64 SERV +* 2a02:8106:211:e900::/56 (up2) + * 2a02:8106:211:e980::/57 ZW + * 2a02:8106:211:e983::/64 PUBLIC + * 2a02:8106:211:e9c0::/64 PRIV1 + * 2a02:8106:211:e9c1::/64 PRIV2 + * 2a02:8106:211:e9c2::/64 PRIV3 + * 2a02:8106:211:e9c3::/64 PRIV4 + * 2a02:8106:211:e9c4::/64 PRIV5 + * 2a02:8106:211:e9c5::/64 PRIV6 + * 2a02:8106:211:e9c6::/64 PRIV7 + * 2a02:8106:211:e9c7::/64 PRIV8 + * 2a02:8106:211:e9c8::/64 PRIV9 + * 2a02:8106:211:e9c9::/64 PRIV10 + * 2a02:8106:211:e9ca::/64 PRIV11 + * 2a02:8106:211:e9cb::/64 PRIV12 + * 2a02:8106:211:e9cc::/64 PRIV13 + * 2a02:8106:211:e9cd::/64 PRIV14 + * 2a02:8106:211:e9ce::/64 PRIV15 + * 2a02:8106:211:e9cf::/64 PRIV16 * […] PRIV24