From 88cadab0f0c0334649ce96aa3d8ad0fb47651de1 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 5 Aug 2022 18:15:00 +0200
Subject: [PATCH] entirely remove obsolete upstream1+upstream2 ipv4 subnets

---
 config/net/core.nix                     | 2 +-
 nix/nixos-module/container/bird.nix     | 4 ----
 nix/nixos-module/container/dnscache.nix | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/config/net/core.nix b/config/net/core.nix
index f7510b2..ce8b784 100644
--- a/config/net/core.nix
+++ b/config/net/core.nix
@@ -218,7 +218,7 @@
           [ "upstream4" "upstream3" "anon1" "freifunk" ];
         stubNets4 = [ "172.20.0.0/14" "10.0.0.0/8" ];
         stubNets6 =
-          [ "fd00::/8" "2a02:8106:208:5200::/56" "2a02:8106:211:e900::/56" ];
+          [ "fd00::/8" "2a00:8180:2c00:200::/56" ];
       };
       role = "container";
     };
diff --git a/nix/nixos-module/container/bird.nix b/nix/nixos-module/container/bird.nix
index f410423..80c97e9 100644
--- a/nix/nixos-module/container/bird.nix
+++ b/nix/nixos-module/container/bird.nix
@@ -350,10 +350,6 @@ in
       protocol static {
         ipv6;
         route fd23:42:c3d2:580::/57 unreachable;
-        # 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;
       }
 
diff --git a/nix/nixos-module/container/dnscache.nix b/nix/nixos-module/container/dnscache.nix
index 18349a3..eca26da 100644
--- a/nix/nixos-module/container/dnscache.nix
+++ b/nix/nixos-module/container/dnscache.nix
@@ -20,10 +20,6 @@ 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"