From f0c5f1d3988fc188d4696979b1e4639469210448 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 7 Nov 2021 02:55:44 +0100
Subject: [PATCH] lib/config/legacy: reflect the actual topology

---
 nix/lib/config/legacy.nix     | 16 +++++++++++++++-
 salt-pillar/switches/init.sls |  4 ----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix
index a9f675e..13f1c72 100644
--- a/nix/lib/config/legacy.nix
+++ b/nix/lib/config/legacy.nix
@@ -359,7 +359,6 @@ in
         ap6.links.switch-b2.ports = [ "wan" ];
         ap21.links.switch-a1.ports = [ "lan" ];
         ap27.links.switch-b2.ports = [ "wan" ];
-        ap28.links.switch-b2.ports = [ "wan" ];
         ap32.links.switch-b2.ports = [ "lan" ];
         ap33.links.switch-b2.ports = [ "lan" ];
         ap36.links.switch-b2.ports = [ "wan" ];
@@ -372,6 +371,21 @@ in
         ap49.links.switch-a1.ports = [ "lan" ];
         ap50.links.switch-a1.ports = [ "lan" ];
         ap52.links.switch-a1.ports = [ "lan" ];
+
+        ap28.links.ap3.ports = [ "wan" ];
+        ap3.links.ap28.ports = [ "lan:1" ];
+        ap3.links.c3d2.ports = lib.mkForce [
+          "lan:2"
+          "lan:3"
+          "lan:4"
+        ];
+        ap34.links.ap42.ports = [ "lan" ];
+        ap42.links.priv4.ports = lib.mkForce [
+          "lan:1"
+          "lan:2"
+          "lan:4"
+        ];
+        ap42.links.ap34.ports = [ "lan:3" ];
       }
 
       # host priv*-gw settings
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 429cc5e..e004a31 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -351,10 +351,6 @@ switches:
       iso6:
         mode: access
         ports: '14'
-      ap34:
-        mode: trunk
-        # Saal A Foyer
-        ports: 20
       # Saal A: durch dummen PoE-Switch mit Aggregation an ap44-50 + switch-a1
       switch-a1:
         mode: bond