switch-a2: add dumb switch

config/ap.nix

@@ -330,11 +330,8 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
-          ports = [ "lan" ];
-        };
       };
-      location = "Foyer (DS20)";
+      location = "Auf Lager";
       model = "unifiac-lite";
       role = "ap";
       wifi = {
@@ -1180,11 +1177,8 @@
         priv27 = {
           ports = [ "lan" ];
         };
-        switch-a1 = {
-          ports = [ "wan" ];
-        };
       };
-      location = "B 2.05.03";
+      location = "Gone?";
       model = "tl-wr1043nd-v1";
       role = "ap";
       wifi = {
@@ -1209,7 +1203,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1246,7 +1240,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1284,7 +1278,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1323,7 +1317,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1360,7 +1354,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1397,7 +1391,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1467,7 +1461,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };
@@ -1545,7 +1539,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-a1 = {
+        switch-a2 = {
           ports = [ "lan" ];
         };
       };

config/switch.nix

@@ -7,13 +7,32 @@
       interfaces = { mgmt.type = "phys"; };
 
       links = {
-        switch-c1.ports = [ "7" ];
+        switch-a2.ports = [ "7" ];
         priv25.ports = [ "2" "3" "4" "5" ];
         priv31.ports = [ "6" ];
         pub.ports = [ "8" ];
         iso4.ports = [ "1" ];
       };
     };
+    switch-a2 = {
+      role = "switch";
+      model = "dumb";
+      location = "Saal A";
+
+      links = {
+        switch-c1.ports = [ "1" ];
+        switch-a1.ports = [ "2" ];
+        ap44.ports = [ "10" ];
+        ap45.ports = [ "11" ];
+        ap46.ports = [ "12" ];
+        ap47.ports = [ "13" ];
+        ap48.ports = [ "14" ];
+        ap49.ports = [ "15" ];
+        ap50.ports = [ "16" ];
+        ap52.ports = [ "17" ];
+      };
+    };
+
     switch-b1 = {
       role = "switch";
       model = "linksys-srw2048";
@@ -158,22 +177,12 @@
       location = "Turm C Keller, bei Kabelanschluessen";
       interfaces = { mgmt.type = "phys"; };
 
-      links = let
-        saal = {
+      links = {
+        # Saal A: durch dummen PoE-Switch mit Aggregation an ap44-50,52 + switch-a1
+        switch-a2 = {
           group = "1";
           ports = [ "15-16" ];
         };
-      in {
-        # Saal A: durch dummen PoE-Switch mit Aggregation an ap44-50,52 + switch-a1
-        switch-a1 = saal;
-        ap44 = saal;
-        ap45 = saal;
-        ap46 = saal;
-        ap47 = saal;
-        ap48 = saal;
-        ap49 = saal;
-        ap50 = saal;
-        ap52 = saal;
         switch-b1 = {
           group = "2";
           ports = [ "21-24" ];