From aba5796a574aceb395847ec55dea196145c5f110 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 2 Jun 2021 19:56:24 +0200
Subject: [PATCH] IPv6 renumbering

---
 nix/lib/config/legacy.nix               |   6 +-
 nix/nixos-module/container/bird.nix     |   7 +-
 nix/nixos-module/container/dnscache.nix |   4 +
 nix/pkgs/dns-slaves.nix                 |   4 +-
 salt-pillar/hosts/init.sls              | 230 ++++++++++++------------
 salt-pillar/subnets/init.sls            |  92 +++++-----
 subnets.md                              |  56 +++---
 7 files changed, 200 insertions(+), 199 deletions(-)

diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix
index f12172f..c265381 100644
--- a/nix/lib/config/legacy.nix
+++ b/nix/lib/config/legacy.nix
@@ -110,7 +110,11 @@ in
           upstream = {
             provider = "dsi";
             link = "up4";
-            upBandwidth = 95000;
+            upBandwidth = 98000;
+            noNat.subnets6 = [
+              "2a00:8180:2000:37::1/128"
+              "2a00:8180:2c00:200::/56"
+            ];
           };
         };
         upstream1.ospf.upstreamInstance = 3;
diff --git a/nix/nixos-module/container/bird.nix b/nix/nixos-module/container/bird.nix
index 8aefc32..3708b9e 100644
--- a/nix/nixos-module/container/bird.nix
+++ b/nix/nixos-module/container/bird.nix
@@ -312,12 +312,11 @@ in
       protocol static {
         ipv6;
         route fd23:42:c3d2:580::/57 unreachable;
-      }
-      # Static Vodafone
-      protocol static {
-        ipv6;
+        # TODO: remove
         route 2a02:8106:208:5200::/56 unreachable;
+        # TODO: remove
         route 2a02:8106:211:e900::/56 unreachable;
+        route 2a00:8180:2c00:200::/56 unreachable;
       }
 
       ${lib.optionalString (hostConf.bgp != null) ''
diff --git a/nix/nixos-module/container/dnscache.nix b/nix/nixos-module/container/dnscache.nix
index d39c642..18349a3 100644
--- a/nix/nixos-module/container/dnscache.nix
+++ b/nix/nixos-module/container/dnscache.nix
@@ -20,8 +20,12 @@ lib.mkIf config.site.hosts.${hostName}.services.dnscache.enable {
         # TODO: generate
         access-control = [
           "fd23:42:c3d2:500::/56 allow"
+          # TODO: remove
           "2a02:8106:208:5200::/56 allow"
+          # TODO: remove
           "2a02:8106:211:e900::/56 allow"
+          "2a00:8180:2000:37::1/128 allow"
+          "2a00:8180:2c00:200::/56 allow"
           "::172.20.72.0/117 allow"
           "::172.22.99.0/120 allow"
           "::1/128 allow"
diff --git a/nix/pkgs/dns-slaves.nix b/nix/pkgs/dns-slaves.nix
index 333a6c5..9b0c906 100644
--- a/nix/pkgs/dns-slaves.nix
+++ b/nix/pkgs/dns-slaves.nix
@@ -7,13 +7,13 @@ writeText "named.slave.conf" (
     zone "${name}" IN {
       type slave;
       masters {
-        2a02:8106:208:5282:2::2;
+        2a00:8180:2c00:282::2;
         fd23:42:c3d2:582:2::2;
         172.20.73.2;
       };
       file "/var/lib/bind/slave/${name}.zone";
       allow-notify {
-        2a02:8106:208:5282:2::2;
+        2a00:8180:2c00:282::2;
         fd23:42:c3d2:582:2::2;
         172.20.73.2;
       };
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index d0ddb58..45e6527 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -556,173 +556,169 @@ hosts-inet6:
       c3d2-gw3: fd23:42:c3d2:523::c3d2:4
       bgp: fd23:42:c3d2:523::c3d2:ff0b
 
-  up1:
+  up4:
     core:
-      server1: 2a02:8106:208:5281::1
-      server2: 2a02:8106:208:5281::102
+      server1: 2a00:8180:2c00:281::1
+      server2: 2a00:8180:2c00:281::102
 
-      anon1: 2a02:8106:208:5281::9:1
-      serv-gw: 2a02:8106:208:5281::8:1
-      c3d2-gw1: 2a02:8106:208:5281::c3d2:1
-      c3d2-gw2: 2a02:8106:208:5281::c3d2:2
-      c3d2-gw3: 2a02:8106:208:5281::c3d2:3
-      c3d2-anon: 2a02:8106:208:5281::c3d2:a
-      bgp: 2a02:8106:208:5281::c3d2:b
-      mgmt-gw: 2a02:8106:208:5281::8:3
-      upstream1: 2a02:8106:208:5281::b:0
-      cls-gw: 2a02:8106:208:5281::8:4
+      anon1: 2a00:8180:2c00:281::9:1
+      serv-gw: 2a00:8180:2c00:281::8:1
+      c3d2-gw1: 2a00:8180:2c00:281::c3d2:1
+      c3d2-gw2: 2a00:8180:2c00:281::c3d2:2
+      c3d2-gw3: 2a00:8180:2c00:281::c3d2:3
+      c3d2-anon: 2a00:8180:2c00:281::c3d2:a
+      bgp: 2a00:8180:2c00:281::c3d2:b
+      mgmt-gw: 2a00:8180:2c00:281::8:3
+      upstream1: 2a00:8180:2c00:281::b:0
+      cls-gw: 2a00:8180:2c00:281::8:4
 
-      freifunk: 2a02:8106:208:5281:8000::1
-      yggdrasil: 2a02:8106:208:5281:9000::1
+      upstream4: 2a00:8180:2c00:281::b:1
+
+      priv1-gw: 2a00:8180:2c00:281::c:0
+      priv2-gw: 2a00:8180:2c00:281::c:1
+      priv3-gw: 2a00:8180:2c00:281::c:2
+      priv4-gw: 2a00:8180:2c00:281::c:3
+      priv5-gw: 2a00:8180:2c00:281::c:4
+      priv6-gw: 2a00:8180:2c00:281::c:5
+      priv7-gw: 2a00:8180:2c00:281::c:6
+      priv8-gw: 2a00:8180:2c00:281::c:7
+      priv9-gw: 2a00:8180:2c00:281::c:8
+      priv10-gw: 2a00:8180:2c00:281::c:9
+      priv11-gw: 2a00:8180:2c00:281::c:a
+      priv12-gw: 2a00:8180:2c00:281::c:b
+      priv13-gw: 2a00:8180:2c00:281::c:c
+      priv14-gw: 2a00:8180:2c00:281::c:d
+      priv15-gw: 2a00:8180:2c00:281::c:e
+      priv16-gw: 2a00:8180:2c00:281::c:f
+      priv17-gw: 2a00:8180:2c00:281::c:10
+      priv18-gw: 2a00:8180:2c00:281::c:11
+      priv19-gw: 2a00:8180:2c00:281::c:12
+      priv20-gw: 2a00:8180:2c00:281::c:13
+      priv21-gw: 2a00:8180:2c00:281::c:14
+      priv22-gw: 2a00:8180:2c00:281::c:15
+      priv23-gw: 2a00:8180:2c00:281::c:16
+      priv24-gw: 2a00:8180:2c00:281::c:17
+      priv25-gw: 2a00:8180:2c00:281::c:18
+      priv26-gw: 2a00:8180:2c00:281::c:19
+      priv27-gw: 2a00:8180:2c00:281::c:1a
+      priv28-gw: 2a00:8180:2c00:281::c:1b
+      priv29-gw: 2a00:8180:2c00:281::c:1c
+      priv30-gw: 2a00:8180:2c00:281::c:1d
+      priv31-gw: 2a00:8180:2c00:281::c:1e
+      priv32-gw: 2a00:8180:2c00:281::c:1f
+      priv33-gw: 2a00:8180:2c00:281::c:20
+      priv34-gw: 2a00:8180:2c00:281::c:21
+      priv35-gw: 2a00:8180:2c00:281::c:22
+      priv36-gw: 2a00:8180:2c00:281::c:23
+      priv37-gw: 2a00:8180:2c00:281::c:24
+      priv38-gw: 2a00:8180:2c00:281::c:25
+      priv39-gw: 2a00:8180:2c00:281::c:26
+      priv40-gw: 2a00:8180:2c00:281::c:27
+
+      freifunk: 2a00:8180:2c00:281:8000::1
+      yggdrasil: 2a00:8180:2c00:281:9000::1
 
     serv:
-      serv-gw: 2a02:8106:208:5282::1
-      dns: 2a02:8106:208:5282:2:0:0:2
-      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
-      dnscache: 2a02:8106:208:5282:f096:dbff:fee8:427d
-      minetest: 2a02:8106:208:5282:c3a:42ff:fe5d:b20c
-      hydra: 2a02:8106:208:5282:e03c:d7ff:fe8e:fe16
+      serv-gw: 2a00:8180:2c00:282::1
+      dns: 2a00:8180:2c00:282:2:0:0:2
+      stats: 2a00:8180:2c00:282:2:0:0:3
+      radius: 2a00:8180:2c00:282:2:0:0:4
+      zeit: 2a00:8180:2c00:282:2:0:0:5
+      dnscache: 2a00:8180:2c00:282:f096:dbff:fee8:427d
+      minetest: 2a00:8180:2c00:282:c3a:42ff:fe5d:b20c
+      hydra: 2a00:8180:2c00:282:e03c:d7ff:fe8e:fe16
 
     cluster:
-      cls-gw: 2a02:8106:208:5286::1
+      cls-gw: 2a00:8180:2c00:284::1
 {%- for i in range(2, 31) %}
-      server{{ i }}: 2a02:8106:208:5286::1{{ i }}
+      server{{ i }}: 2a00:8180:2c00:284::1{{ i }}
 {%- endfor %}
 
     c3d2:
-      c3d2-anon: 2a02:8106:208:5201::c3d2:1
-      c3d2-gw1: 2a02:8106:208:5201::c3d2:2
-      c3d2-gw2: 2a02:8106:208:5201::c3d2:3
-      c3d2-gw3: 2a02:8106:208:5201::c3d2:4
-      bgp: 2a02:8106:208:5201::c3d2:ff0b
+      c3d2-anon: 2a00:8180:2c00:223::c3d2:1
+      c3d2-gw1: 2a00:8180:2c00:223::c3d2:2
+      c3d2-gw2: 2a00:8180:2c00:223::c3d2:3
+      c3d2-gw3: 2a00:8180:2c00:223::c3d2:4
+      bgp: 2a00:8180:2c00:223::c3d2:ff0b
 
-  up2:
-    core:
-      server1: 2a02:8106:211:e981::1
-      server2: 2a02:8106:211:e981::102
-
-      upstream2: 2a02:8106:211:e981::b:1
-
-      priv1-gw: 2a02:8106:211:e981::c:0
-      priv2-gw: 2a02:8106:211:e981::c:1
-      priv3-gw: 2a02:8106:211:e981::c:2
-      priv4-gw: 2a02:8106:211:e981::c:3
-      priv5-gw: 2a02:8106:211:e981::c:4
-      priv6-gw: 2a02:8106:211:e981::c:5
-      priv7-gw: 2a02:8106:211:e981::c:6
-      priv8-gw: 2a02:8106:211:e981::c:7
-      priv9-gw: 2a02:8106:211:e981::c:8
-      priv10-gw: 2a02:8106:211:e981::c:9
-      priv11-gw: 2a02:8106:211:e981::c:a
-      priv12-gw: 2a02:8106:211:e981::c:b
-      priv13-gw: 2a02:8106:211:e981::c:c
-      priv14-gw: 2a02:8106:211:e981::c:d
-      priv15-gw: 2a02:8106:211:e981::c:e
-      priv16-gw: 2a02:8106:211:e981::c:f
-      priv17-gw: 2a02:8106:211:e981::c:10
-      priv18-gw: 2a02:8106:211:e981::c:11
-      priv19-gw: 2a02:8106:211:e981::c:12
-      priv20-gw: 2a02:8106:211:e981::c:13
-      priv21-gw: 2a02:8106:211:e981::c:14
-      priv22-gw: 2a02:8106:211:e981::c:15
-      priv23-gw: 2a02:8106:211:e981::c:16
-      priv24-gw: 2a02:8106:211:e981::c:17
-      priv25-gw: 2a02:8106:211:e981::c:18
-      priv26-gw: 2a02:8106:211:e981::c:19
-      priv27-gw: 2a02:8106:211:e981::c:1a
-      priv28-gw: 2a02:8106:211:e981::c:1b
-      priv29-gw: 2a02:8106:211:e981::c:1c
-      priv30-gw: 2a02:8106:211:e981::c:1d
-      priv31-gw: 2a02:8106:211:e981::c:1e
-      priv32-gw: 2a02:8106:211:e981::c:1f
-      priv33-gw: 2a02:8106:211:e981::c:20
-      priv34-gw: 2a02:8106:211:e981::c:21
-      priv35-gw: 2a02:8106:211:e981::c:22
-      priv36-gw: 2a02:8106:211:e981::c:23
-      priv37-gw: 2a02:8106:211:e981::c:24
-      priv38-gw: 2a02:8106:211:e981::c:25
-      priv39-gw: 2a02:8106:211:e981::c:26
-      priv40-gw: 2a02:8106:211:e981::c:27
 
     priv1:
-      priv1-gw: 2a02:8106:211:e9c0::1
+      priv1-gw: 2a00:8180:2c00:2c0::1
     priv2:
-      priv2-gw: 2a02:8106:211:e9c1::1
+      priv2-gw: 2a00:8180:2c00:2c1::1
     priv3:
-      priv3-gw: 2a02:8106:211:e9c2::1
+      priv3-gw: 2a00:8180:2c00:2c2::1
     priv4:
-      priv4-gw: 2a02:8106:211:e9c3::1
+      priv4-gw: 2a00:8180:2c00:2c3::1
     priv5:
-      priv5-gw: 2a02:8106:211:e9c4::1
+      priv5-gw: 2a00:8180:2c00:2c4::1
     priv6:
-      priv6-gw: 2a02:8106:211:e9c5::1
+      priv6-gw: 2a00:8180:2c00:2c5::1
     priv7:
-      priv7-gw: 2a02:8106:211:e9c6::1
+      priv7-gw: 2a00:8180:2c00:2c6::1
     priv8:
-      priv8-gw: 2a02:8106:211:e9c7::1
+      priv8-gw: 2a00:8180:2c00:2c7::1
     priv9:
-      priv9-gw: 2a02:8106:211:e9c8::1
+      priv9-gw: 2a00:8180:2c00:2c8::1
     priv10:
-      priv10-gw: 2a02:8106:211:e9c9::1
+      priv10-gw: 2a00:8180:2c00:2c9::1
     priv11:
-      priv11-gw: 2a02:8106:211:e9ca::1
+      priv11-gw: 2a00:8180:2c00:2ca::1
     priv12:
-      priv12-gw: 2a02:8106:211:e9cb::1
+      priv12-gw: 2a00:8180:2c00:2cb::1
     priv13:
-      priv13-gw: 2a02:8106:211:e9cc::1
+      priv13-gw: 2a00:8180:2c00:2cc::1
     priv14:
-      priv14-gw: 2a02:8106:211:e9cd::1
+      priv14-gw: 2a00:8180:2c00:2cd::1
     priv15:
-      priv15-gw: 2a02:8106:211:e9ce::1
+      priv15-gw: 2a00:8180:2c00:2ce::1
     priv16:
-      priv16-gw: 2a02:8106:211:e9cf::1
+      priv16-gw: 2a00:8180:2c00:2cf::1
     priv17:
-      priv17-gw: 2a02:8106:211:e9d0::1
+      priv17-gw: 2a00:8180:2c00:2d0::1
     priv18:
-      priv18-gw: 2a02:8106:211:e9d1::1
+      priv18-gw: 2a00:8180:2c00:2d1::1
     priv19:
-      priv19-gw: 2a02:8106:211:e9d2::1
+      priv19-gw: 2a00:8180:2c00:2d2::1
     priv20:
-      priv20-gw: 2a02:8106:211:e9d3::1
+      priv20-gw: 2a00:8180:2c00:2d3::1
     priv21:
-      priv21-gw: 2a02:8106:211:e9d4::1
+      priv21-gw: 2a00:8180:2c00:2d4::1
     priv22:
-      priv22-gw: 2a02:8106:211:e9d5::1
+      priv22-gw: 2a00:8180:2c00:2d5::1
     priv23:
-      priv23-gw: 2a02:8106:211:e9d6::1
+      priv23-gw: 2a00:8180:2c00:2d6::1
     priv24:
-      priv24-gw: 2a02:8106:211:e9d7::1
+      priv24-gw: 2a00:8180:2c00:2d7::1
     priv25:
-      priv25-gw: 2a02:8106:211:e9d8::1
+      priv25-gw: 2a00:8180:2c00:2d8::1
     priv26:
-      priv26-gw: 2a02:8106:211:e9d9::1
+      priv26-gw: 2a00:8180:2c00:2d9::1
     priv27:
-      priv27-gw: 2a02:8106:211:e9da::1
+      priv27-gw: 2a00:8180:2c00:2da::1
     priv28:
-      priv28-gw: 2a02:8106:211:e9db::1
+      priv28-gw: 2a00:8180:2c00:2db::1
     priv29:
-      priv29-gw: 2a02:8106:211:e9dc::1
+      priv29-gw: 2a00:8180:2c00:2dc::1
     priv30:
-      priv30-gw: 2a02:8106:211:e9dd::1
+      priv30-gw: 2a00:8180:2c00:2dd::1
     priv31:
-      priv31-gw: 2a02:8106:211:e9de::1
+      priv31-gw: 2a00:8180:2c00:2de::1
     priv32:
-      priv32-gw: 2a02:8106:211:e9df::1
+      priv32-gw: 2a00:8180:2c00:2df::1
     priv33:
-      priv33-gw: 2a02:8106:211:e9e0::1
+      priv33-gw: 2a00:8180:2c00:2e0::1
     priv34:
-      priv34-gw: 2a02:8106:211:e9e1::1
+      priv34-gw: 2a00:8180:2c00:2e1::1
     priv35:
-      priv35-gw: 2a02:8106:211:e9e2::1
+      priv35-gw: 2a00:8180:2c00:2e2::1
     priv36:
-      priv36-gw: 2a02:8106:211:e9e3::1
+      priv36-gw: 2a00:8180:2c00:2e3::1
     priv37:
-      priv37-gw: 2a02:8106:211:e9e4::1
+      priv37-gw: 2a00:8180:2c00:2e4::1
     priv38:
-      priv38-gw: 2a02:8106:211:e9e5::1
+      priv38-gw: 2a00:8180:2c00:2e5::1
     priv39:
-      priv39-gw: 2a02:8106:211:e9e5::1
+      priv39-gw: 2a00:8180:2c00:2e5::1
     priv40:
-      priv40-gw: 2a02:8106:211:e9e6::1
+      priv40-gw: 2a00:8180:2c00:2e6::1
diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls
index 7d0900a..1be0555 100644
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@@ -94,50 +94,48 @@ subnets-inet6:
     priv39: fd23:42:c3d2:5e6::/64
     priv40: fd23:42:c3d2:5e7::/64
     c3d2: fd23:42:c3d2:523::/64
-  up1:
-    c3d2: 2a02:8106:208:5201::/64
-    core: 2a02:8106:208:5281::/64
-    serv: 2a02:8106:208:5282::/64
-    cluster: 2a02:8106:208:5286::/64
-  up2:
-    core: 2a02:8106:211:e981::/64
-    priv1: 2a02:8106:211:e9c0::/64
-    priv2: 2a02:8106:211:e9c1::/64
-    priv3: 2a02:8106:211:e9c2::/64
-    priv4: 2a02:8106:211:e9c3::/64
-    priv5: 2a02:8106:211:e9c4::/64
-    priv6: 2a02:8106:211:e9c5::/64
-    priv7: 2a02:8106:211:e9c6::/64
-    priv8: 2a02:8106:211:e9c7::/64
-    priv9: 2a02:8106:211:e9c8::/64
-    priv10: 2a02:8106:211:e9c9::/64
-    priv11: 2a02:8106:211:e9ca::/64
-    priv12: 2a02:8106:211:e9cb::/64
-    priv13: 2a02:8106:211:e9cc::/64
-    priv14: 2a02:8106:211:e9cd::/64
-    priv15: 2a02:8106:211:e9ce::/64
-    priv16: 2a02:8106:211:e9cf::/64
-    priv17: 2a02:8106:211:e9d0::/64
-    priv18: 2a02:8106:211:e9d1::/64
-    priv19: 2a02:8106:211:e9d2::/64
-    priv20: 2a02:8106:211:e9d3::/64
-    priv21: 2a02:8106:211:e9d4::/64
-    priv22: 2a02:8106:211:e9d5::/64
-    priv23: 2a02:8106:211:e9d6::/64
-    priv24: 2a02:8106:211:e9d7::/64
-    priv25: 2a02:8106:211:e9d8::/64
-    priv26: 2a02:8106:211:e9d9::/64
-    priv27: 2a02:8106:211:e9da::/64
-    priv28: 2a02:8106:211:e9db::/64
-    priv29: 2a02:8106:211:e9dc::/64
-    priv30: 2a02:8106:211:e9dd::/64
-    priv31: 2a02:8106:211:e9de::/64
-    priv32: 2a02:8106:211:e9df::/64
-    priv33: 2a02:8106:211:e9e0::/64
-    priv34: 2a02:8106:211:e9e1::/64
-    priv35: 2a02:8106:211:e9e2::/64
-    priv36: 2a02:8106:211:e9e3::/64
-    priv37: 2a02:8106:211:e9e4::/64
-    priv38: 2a02:8106:211:e9e5::/64
-    priv39: 2a02:8106:211:e9e6::/64
-    priv40: 2a02:8106:211:e9e7::/64
+  up4:
+    c3d2: 2a00:8180:2c00:223::/64
+    core: 2a00:8180:2c00:281::/64
+    serv: 2a00:8180:2c00:282::/64
+    cluster: 2a00:8180:2c00:284::/64
+    priv1: 2a00:8180:2c00:2c0::/64
+    priv2: 2a00:8180:2c00:2c1::/64
+    priv3: 2a00:8180:2c00:2c2::/64
+    priv4: 2a00:8180:2c00:2c3::/64
+    priv5: 2a00:8180:2c00:2c4::/64
+    priv6: 2a00:8180:2c00:2c5::/64
+    priv7: 2a00:8180:2c00:2c6::/64
+    priv8: 2a00:8180:2c00:2c7::/64
+    priv9: 2a00:8180:2c00:2c8::/64
+    priv10: 2a00:8180:2c00:2c9::/64
+    priv11: 2a00:8180:2c00:2ca::/64
+    priv12: 2a00:8180:2c00:2cb::/64
+    priv13: 2a00:8180:2c00:2cc::/64
+    priv14: 2a00:8180:2c00:2cd::/64
+    priv15: 2a00:8180:2c00:2ce::/64
+    priv16: 2a00:8180:2c00:2cf::/64
+    priv17: 2a00:8180:2c00:2d0::/64
+    priv18: 2a00:8180:2c00:2d1::/64
+    priv19: 2a00:8180:2c00:2d2::/64
+    priv20: 2a00:8180:2c00:2d3::/64
+    priv21: 2a00:8180:2c00:2d4::/64
+    priv22: 2a00:8180:2c00:2d5::/64
+    priv23: 2a00:8180:2c00:2d6::/64
+    priv24: 2a00:8180:2c00:2d7::/64
+    priv25: 2a00:8180:2c00:2d8::/64
+    priv26: 2a00:8180:2c00:2d9::/64
+    priv27: 2a00:8180:2c00:2da::/64
+    priv28: 2a00:8180:2c00:2db::/64
+    priv29: 2a00:8180:2c00:2dc::/64
+    priv30: 2a00:8180:2c00:2dd::/64
+    priv31: 2a00:8180:2c00:2de::/64
+    priv32: 2a00:8180:2c00:2df::/64
+    priv33: 2a00:8180:2c00:2e0::/64
+    priv34: 2a00:8180:2c00:2e1::/64
+    priv35: 2a00:8180:2c00:2e2::/64
+    priv36: 2a00:8180:2c00:2e3::/64
+    priv37: 2a00:8180:2c00:2e4::/64
+    priv38: 2a00:8180:2c00:2e5::/64
+    priv39: 2a00:8180:2c00:2e6::/64
+    priv40: 2a00:8180:2c00:2e7::/64
diff --git a/subnets.md b/subnets.md
index d523a95..b47966a 100644
--- a/subnets.md
+++ b/subnets.md
@@ -88,32 +88,32 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 
 * 172.22.99.0/24
 
-## Vodafone fixed IPv4
-* 24.134.104.53 (up1)
-* 24.134.252.105 (up2)
+## DSI fixed IPv4
+* 81.201.149.152 (up4)
 
-## Vodafone fixed IPv6
-* 2a02:8106:208:5200::/56 (up1)
-  * 2a02:8106:208:5201::/64 C3D2
-  * 2a02:8106:208:5281::/64 CORE
-  * 2a02:8106:208:5282::/64 SERV
-  * 2a02:8106:208:5284::/64 CLUSTER
-* 2a02:8106:211:e900::/56 (up2)
-  * 2a02:8106:211:e980::/57 ZW
-    * 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
-    * […] PRIV61
+## DSI fixed IPv6
+* 2a00:8180:2000:37::1/64 (up4)
+* 2a00:8180:2c00:200::/56
+
+* 2a00:8180:2c00:223::/64 C3D2
+
+* 2a00:8180:2c00:281::/64 CORE
+* 2a00:8180:2c00:282::/64 SERV
+* 2a00:8180:2c00:284::/64 CLUSTER
+* 2a00:8180:2c00:2c0::/64 PRIV1
+* 2a00:8180:2c00:2c1::/64 PRIV2
+* 2a00:8180:2c00:2c2::/64 PRIV3
+* 2a00:8180:2c00:2c3::/64 PRIV4
+* 2a00:8180:2c00:2c4::/64 PRIV5
+* 2a00:8180:2c00:2c5::/64 PRIV6
+* 2a00:8180:2c00:2c6::/64 PRIV7
+* 2a00:8180:2c00:2c7::/64 PRIV8
+* 2a00:8180:2c00:2c8::/64 PRIV9
+* 2a00:8180:2c00:2c9::/64 PRIV10
+* 2a00:8180:2c00:2ca::/64 PRIV11
+* 2a00:8180:2c00:2cb::/64 PRIV12
+* 2a00:8180:2c00:2cc::/64 PRIV13
+* 2a00:8180:2c00:2cd::/64 PRIV14
+* 2a00:8180:2c00:2ce::/64 PRIV15
+* 2a00:8180:2c00:2cf::/64 PRIV16
+* […] PRIV61