ap69, ap70: prepare

config/ap.nix

@@ -925,7 +925,6 @@
           ssids = {
             "ZW public" = { net = "pub"; };
             "hechtfilm.de legacy" = { net = "priv19"; };
-            "LIZA".net = "priv43";
           };
         };
       };
@@ -1051,12 +1050,9 @@
         pub.type = "bridge";
       };
       links = {
-        priv22 = {
-          ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
-        };
-        switch-b3 = {
-          ports = [ "wan" ];
-        };
+        priv22.ports = [ "lan:2" "lan:3" "lan:4" ];
+        ap70.ports = [ "lan:1" ];
+        switch-b3.ports = [ "wan" ];
       };
       location = "B4.01";
       model = "tplink_archer-c7-v5";
@@ -2173,6 +2169,46 @@
         };
       };
     };
+    ap69 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv43.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        priv43 = {
+          ports = [ "lan" ];
+        };
+        switch-b3 = {
+          ports = [ "wan" ];
+        };
+      };
+      location = "B.01.B01";
+      model = "tplink_archer-c7-v2";
+      role = "ap";
+      wifi = {
+        "pci0000:00/0000:00:00.0" = {
+          channel = 36;
+          htmode = "HT40+";
+          ssids = {
+            "ZW public".net = "pub";
+            "LIZA".net = "priv43";
+          };
+        };
+        "platform/ahb/18100000.wmac" = {
+          channel = 1;
+          htmode = "HT20";
+          ssids = {
+            "ZW public".net = "pub";
+            "LIZA".net = "priv43";
+          };
+        };
+      };
+    };
     ap7 = {
       interfaces = {
         mgmt = {
@@ -2205,6 +2241,42 @@
         };
       };
     };
+    ap70 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv22.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        priv22.ports = [ "lan" ];
+        ap40.ports = [ "wan" ];
+      };
+      location = "B4.01 behind ap40";
+      model = "tplink_archer-c7-v2";
+      role = "ap";
+      wifi = {
+        "pci0000:00/0000:00:00.0" = {
+          channel = 149;
+          htmode = "HT40+";
+          ssids = {
+            "ZW public".net = "pub";
+            M.net = "priv22";
+          };
+        };
+        "platform/ahb/18100000.wmac" = {
+          channel = 9;
+          htmode = "HT20";
+          ssids = {
+            "ZW public".net = "pub";
+            "M legacy".net = "priv22";
+          };
+        };
+      };
+    };
     ap8 = {
       interfaces = {
         c3d2.type = "bridge";

config/net/mgmt.nix

@@ -67,7 +67,9 @@
       ap66 = "10.0.0.106";
       ap67 = "10.0.0.107";
       ap68 = "10.0.0.108";
+      ap69 = "10.0.0.109";
       ap7 = "10.0.0.47";
+      ap70 = "10.0.0.110";
       ap8 = "10.0.0.48";
       ap9 = "10.0.0.49";
       logging = "10.0.0.251";
@@ -171,7 +173,9 @@
         ap66 = "fd23:42:c3d2:580::4:42";
         ap67 = "fd23:42:c3d2:580::4:43";
         ap68 = "fd23:42:c3d2:580::4:44";
+        ap69 = "fd23:42:c3d2:580::4:45";
         ap7 = "fd23:42:c3d2:580::4:7";
+        ap70 = "fd23:42:c3d2:580::4:46";
         ap8 = "fd23:42:c3d2:580::4:8";
         ap9 = "fd23:42:c3d2:580::4:9";
         mgmt-gw = "fd23:42:c3d2:580:ffff:ffff:ffff:ffff";

config/secrets-production.nix.gpg

@@ -1,81 +1,81 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-BzhK
-=aQ9x
+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
+=SW+3
 -----END PGP MESSAGE-----

config/secrets.nix

@@ -69,6 +69,8 @@
     ap66.password = "encrypted";
     ap67.password = "encrypted";
     ap68.password = "encrypted";
+    ap69.password = "encrypted";
+    ap70.password = "encrypted";
     switch-a1.password = "encrypted";
     switch-b1.password = "encrypted";
     switch-b2.password = "encrypted";
@@ -161,7 +163,6 @@
     ap37.wifi = {
       "pci0000:00/0000:00:00.0".ssids."hechtfilm.de".psk = "encrypted";
       "platform/ahb/18100000.wmac".ssids."hechtfilm.de legacy".psk = "encrypted";
-      "platform/ahb/18100000.wmac".ssids."LIZA".psk = "encrypted";
     };
     ap38.wifi = {
       "pci0000:00/0000:00:00.0".ssids = {
@@ -293,7 +294,15 @@
       "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0".ssids."farbwerk".psk = "encrypted";
       "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0+1".ssids."farbwerk".psk = "encrypted";
     };
+    ap69.wifi = {
+      "pci0000:00/0000:00:00.0".ssids."LIZA".psk = "encrypted";
+      "platform/ahb/18100000.wmac".ssids."LIZA".psk = "encrypted";
+    };
     ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted";
+    ap70.wifi = {
+      "pci0000:00/0000:00:00.0".ssids."M".psk = "encrypted";
+      "platform/ahb/18100000.wmac".ssids."M legacy".psk = "encrypted";
+    };
     ap8.wifi = {
       "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted";
       "platform/ar934x_wmac".ssids = {

flake.lock

@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705833569,
-        "narHash": "sha256-dQAFiSP+rW1OIsC0XVrXmwW4DShdDMXPUlZ5/x5e3iA=",
+        "lastModified": 1705873976,
+        "narHash": "sha256-uAptd7pmEDLV/Gw4kc8t6iNjElESUXyCtph7IWJID58=",
         "owner": "astro",
         "repo": "nix-openwrt-imagebuilder",
-        "rev": "593e499e5fa5e92775f65d2a9bb1754b941d3e4a",
+        "rev": "8f2a87b329ad9b855925890d93024d6cabb7d1f4",
         "type": "github"
       },
       "original": {

nix/pkgs/openwrt/default.nix

@@ -7,7 +7,7 @@ let
 
   modelPackages = {
     "tplink_archer-c7-v2" = [
-      "-kmod-ath10k-ct" "-ath10k-firmware-qca988x-ct"
+      "-kmod-ath10k-ct" "-ath10k-firmware-qca988x-ct-full-htt" "-ath10k-firmware-qca988x-ct"
       "kmod-ath10k" "ath10k-firmware-qca988x"
     ];
     "tplink_archer-c7-v5" = [