ap67, ap68: deploy

config/ap.nix

@@ -2097,6 +2097,82 @@
         };
       };
     };
+    ap67 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv12.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        priv48.ports = [
+          "lan1" "lan2" "lan3"
+        ];
+        switch-b3.ports = [ "wan" ];
+      };
+      location = "Farbwerk";
+      model = "zyxel_wsm20";
+      role = "ap";
+      wifi = {
+        "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0" = {
+          channel = 6;
+          htmode = "HT20";
+          ssids = {
+            "ZW public" = { net = "pub"; };
+            farbwerk = { net = "priv12"; };
+          };
+        };
+        "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0+1" = {
+          channel = 149;
+          htmode = "VHT80";
+          ssids = {
+            "ZW public" = { net = "pub"; };
+            farbwerk = { net = "priv12"; };
+          };
+        };
+      };
+    };
+    ap68 = {
+      interfaces = {
+        mgmt = {
+          gw4 = "mgmt-gw";
+          gw6 = "mgmt-gw";
+          type = "phys";
+        };
+        priv12.type = "bridge";
+        pub.type = "bridge";
+      };
+      links = {
+        priv48.ports = [
+          "lan1" "lan2" "lan3"
+        ];
+        switch-b3.ports = [ "wan" ];
+      };
+      location = "Farbwerk";
+      model = "zyxel_wsm20";
+      role = "ap";
+      wifi = {
+        "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0" = {
+          channel = 1;
+          htmode = "HT20";
+          ssids = {
+            "ZW public" = { net = "pub"; };
+            farbwerk = { net = "priv12"; };
+          };
+        };
+        "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0+1" = {
+          channel = 36;
+          htmode = "VHT80";
+          ssids = {
+            "ZW public" = { net = "pub"; };
+            farbwerk = { net = "priv12"; };
+          };
+        };
+      };
+    };
     ap7 = {
       interfaces = {
         mgmt = {

config/net/mgmt.nix

@@ -65,6 +65,8 @@
       ap64 = "10.0.0.104";
       ap65 = "10.0.0.105";
       ap66 = "10.0.0.106";
+      ap67 = "10.0.0.107";
+      ap68 = "10.0.0.108";
       ap7 = "10.0.0.47";
       ap8 = "10.0.0.48";
       ap9 = "10.0.0.49";
@@ -167,6 +169,8 @@
         ap64 = "fd23:42:c3d2:580::4:40";
         ap65 = "fd23:42:c3d2:580::4:41";
         ap66 = "fd23:42:c3d2:580::4:42";
+        ap67 = "fd23:42:c3d2:580::4:43";
+        ap68 = "fd23:42:c3d2:580::4:44";
         ap7 = "fd23:42:c3d2:580::4:7";
         ap8 = "fd23:42:c3d2:580::4:8";
         ap9 = "fd23:42:c3d2:580::4:9";

config/secrets-production.nix.gpg

@@ -1,80 +1,81 @@
 -----BEGIN PGP MESSAGE-----
 
-hQEMA2PKcvDMvlKLAQf/Rsz4RE5D9wl+/60iSruwqmXGUeqcGufnUavfXqsX8eoR
-vUEYhQiosJ15u6T+gNCysz4ThWq5kt4gjRRcT1eOq8UeKTouvb4XnH9OgboZ0Vnc
-Y++4LKFsaDuxxgjUXjSVZWXprsJau9lb5c6mj7r97MMkehqBtbt1kee1J9aeCpps
-1adSpkqp/fW3Yt+/dJHUQyD4fQN1jV56/+FhM+gVAFDbE2pWLwXiVofmYD4Oc/P7
-vAP9esOiEntQaT9C7Sthik0ihY0FBLEOcTgAnAyzZJNYV274h5NX1YGD24QzuO92
-zGiSlCJQTcFDU0X9ijhqYmmBkYKeXNR5r8Mumk4gnNLqAfmGq65w26kUVzoBgTHm
-czsOMvrn/ebCa+gY3tKwzIi+Mo5FaM35grdpngQ9/t0IPjOENKi2bKAEw6fUJWc7
-FL6C8McfhJHG6rohxKc6jsKMUQSxDlWPus2jwUL3Z7X8Ky99NvaYWjveM3O/dtoq
-EDEzF0BvLvZVBqSIwfKb+uN/XPDD0566eJNhTERp6yAJYACz/gZ8YFQLkujqg0cF
-sxeQNaAVo5YKpaBHig4t12Qydw4wncCzvlh+NLhx2KEg0gbsW8hmaxberdJm9JcL
-Ty7553yMT5cQwkagfz4cjPYH2hHhdwXV6aHIHZ9wLJrRNGyg1i5sj29anaG4wEPR
-x52oBs151IHg47p8ThGPjEECsRvQeZrbPNl4Y+jje4rsPeaM47EyoH3+qyQRlb8B
-afp05ONJbrmaXs1fW/H8Kq/QymMWpdPhqRdmmTyiQejX2+KEMDLRCMWKXshCFf4Q
-liAtc3NnzkTUWyy4tSCkEYVgJhKFpGigYUZk7i5FRa6ylZs+ZbA7s86owqFgd1ey
-oiPKqUdiiABsM8S3d2Icb7wsYoHKWRpAbPigDW9UMjOzfbKC0Th9BcELmkIi8Ixg
-3FSyCPhlHOq5uKPpcOc2RSUcG2ZldeavktPTwA8GHWLpYQjqn7nd2uNbMw6YvG8v
-ZnUG2f8Xo6ORibL/5bMD6zocM7XXQmzpnWFB90deLXhsWlJB6pw0+TFp++eiM52T
-TVgIZ26yAQu8pMmxXKT72P6nNZT0P5wAifvrPYsC/DXfrU4Y20b3gdWtTKSghBYg
-9kKSXljlzos4ZlrrJPV0zP8c6T0GbYNMVDH9CLzz0oJEnjaQoATAEaegzFuhgRmf
-SWZllt6JINH7GhjABK8eGh2ev5iHIAXZ2P/TYWP7A0vT47SWvKFqMTMAdx6yC5ab
-pHn7pcEsLD1wYTfYxoMM0qtsl3GG7ybyWyqpmjg4H7t6QydlCi2dKKRMAM67qKk9
-O0tzyFxtZ4H+3VEQHv5W1FbzZkR3umNxwH/9B2Xi94vrUxnH3gG15qNn3DE3u0yl
-T36DzmfSKlpmOnTJXpDKrcCTh6ZQjmG8aV6jMunD6BEp1TLzdKXV+tecufMgoOoo
-XC3aHNe4m8gjNRUv3mCvcriSuZQDmQQfcHc3jbIzzNmUJKTNWRAutUskHT4IHDcg
-3E5F/EGVbiEjmB7NraYYPGoa6Q4fIBNiMd+41By1dg+B+eoOu5HmbLMqoAmooBcg
-5VwWzoHCViMu0aXGu8PvGp4bSgXZWBCa6Y5s99RgesFHz4/5By24fccNrEVGuLxV
-HocmoWgxvjtyPTdFcPcKUeilu21e/td/xh4HN+3hX2TjCQsA7Xx0pfju0Nuvu/zj
-eOrJy9QbQkkTbMdkKfqoNGSDAPuy+fh6n3eupAJrUnsn0J1a0SRjXcB0Rre247fR
-IHnJZtA7C6ywR1yhL3CI67b7t6p0sTL93iD12ck98gpP127iX3tFKpiNsa2rR1Xf
-1xAIbqn6ACnZyw2IdctAu5DTkBKapjyiFlGIE8ddBeOZ7WREQmgaRAoUPCl3VBQl
-NFyn0ava/fdOLiDvps+Y6o2b5h2rkFUg1/GlEzhKdqdpfWSDX/TPCV7i8bzMK1x4
-STjhUUO/Y9OaPiNveOCGsEJ2BYvjLOL3x4f4q1d0Ew24qnH59+vbcHdFYS9jBCTy
-R6Gne0s4OR5oh0mS0LYTnqh3L+nzlmqacuoSjOFdTX31R/EWCw2Arb6MrE+o85Mb
-6ACCrMInhsqhnfE6GRlBtgb8Lfym8Yh/kPJ5LMDDooF8WZ+BWqZMEDrhmPNwRHEP
-Ky4J/LbKZmPpWfE5kmk0zv8FNJlFwpIUaK7yJU+4/nKdymmpC2nZnaKrt2QvQvk6
-Y/vMIDuHuTwoXSpfKvflufJ32s7WZosv1tdfgrF/FnJcZwVVONUodDRRcb0qm7cM
-X7+cKbS4zPZ/imV414l4k4ZzSUOxgEVg36yOifRv2dgrbEKnZnF+kea96tpwBGNh
-wQ3D/3UYB1L2QA7fmY4/uhRyeEOEZuWTzOXlJiiS88Oqht7WStCCMawdCZVyDhJm
-LjuaRiPhAV5fts1+DmhlTBsvf7cTGINumFdmiyZZP5ZhWpbXx48HmaeAOWwLIIt8
-VTwwyXkra0XgRJmnblB2M/OaxxhZxYEg9NMFqhRTvEanhgNpfAXOb7zm+9brZ0K2
-/UZbvBIzsH1GaOol1n5NozafXtr8wPqnVSG26uUbhTjW75UhMfYsCD2Ak2qYYLhH
-UIReCYxhVrce/urYSxABThKEVh+GeDnLvdYs9/HlcPc/QUp/pgiGfeNUCw5x9QG+
-HiisUB8VF8//9RqT3m878hU3NRluTMn1jUiRWSBcwNq9IwkHddy4Yd/vlD7H3X0x
-O9TfghnbHJoFRX6s/VbS58UncANW3evVBQ4Ox91RyDqyvkUl+2BdfJ8JolJOVjVJ
-19Y5OnTUo7rU9Cssy6eQPIMxh0hwDtaW0YcvliR9oACuOBajJ7pd8sozv9+WH+qE
-Lbibs9pC46USKfRTPlfKogJverCJtqquIz/XZmqy5rwYXzKN0fVCWyOraxYz4uvT
-L5oBMy1myALgm2Stn3d9Dk03VkErzzMAWHpe81NGmWTh1AkpnFCdJ6BEaDJFOXxC
-b+q8LGj6WMFCcd5PwPLSlVioGu5lwF94Is+zWLZHp8zaAkcro9Agn8E+U0VEnwbz
-4AlKty5kD0CfDkjG1epzBMfj6pyQOQsJOeUpu3Xjpv2gEgCm8vFzurjLTCYnQ7wA
-1x7ChZLYIft7xQEWlcKT671JGpX0TuDHF1pf+EPDx6QwNyzVw0knFILSZPQiG3VH
-QWlhRLVnWwQNUDrtCtLFVZ55UgugrTXrWzK6ADDbQCVPdA5b5pNJ4QRqguAbP5ef
-CI0fFM8QjEhghNJtFbLgkM3bt3c5LA4lpB03sTbGjlsCPtcVmqd538Nw2KzrL62x
-zMaOBsULhvbgvEQRLJDseBikey1SuunJNBJ5+yWwVuCnAPZZk8Y6/BXzhDW/kx+d
-oHvTQsEyzTzOnagu9cphMm0iGIPP3SPOqmOpyfV8ccMLSgIr33Wv2PgCcoEnST0C
-h/JSkvXOryOMKlkQrBI7VSowNGiH4m1s9McHdCIq1og4RAa3Ymi8+2jmLQQCWPei
-VIj/7HKC+0mPRbEa27QMRPMMf4slZRkYsz9TBTZWoJSIGAUoRLbAaWx1PzPgNHti
-0lVfQbpSH9j012NKc/whLwISjUAJf1Qmc6+YFB//gNB5x8uvLZf5rWshNWyw6+Um
-GVCaSHs1B9KUmzV+bK1YfJ9RRtvduDZg4B6DTQQ3z5bAXKRD6uqG7dJqoLnQQAb5
-AI9Ut3V+VS4rHlO0T38I1T2cJlOMwMunSGhWcysp6ix0iElgC+Wovpd/FCdgQA7N
-jDXyyNLPLWD5rqmM/26iCSnX3Vy6OKGaZ2Uk6WQeLybemMG5Fgl2DcOZXXXhwJic
-Afj8rijY3lKQmKESVGUurjdELP/lfE5SiBne2TfMmmZpuqOctdrdJCXF0C9iOv1w
-1t7SBIabLqY/2MMTMWaUJMwnHcIviMKjg4ExbZ4gJ5SZ2EWR67qokbI1+Y2gsiR8
-Gv4t6KzEEngrC++wuq64p+qmeGpY5eslbZk43WXzwThBBz+Cf7zH1+5eDr/wlvHk
-sZFIk4xWPTxM6D0o1IfEm1AIDVELNarrgAgJ0MIXSCeQWay4RGq/iL/BQyW8bWmS
-OaYln5WnsM9Wa7YzCqVoJTQNfXMvT9ndO/9Pgrtj+gtgtFwzGmVy6tZH+mF98HBQ
-dOsCwJDZNuwrMmBS24JEhGlNTDjkXRb16FocdGDgtidhwncXGYJv4kEC0JF40269
-+HZGIqOgShVrqVGc8cbIClrkmNCtQzkcn3HdbE8Ux+QHQPFAM9h00Xwp4HjvxCO2
-+4MkuNpEvtiIjbcR/usiKwqRThhyE1o7V+uywjeWE0MgeOqHG8qVSBjWCLQW/V/w
-P1gVnipCZoRdtETyq6A1OpKGxCmUD2XFzzQA//aCTFfRW4ZlUvYVHzJfNtHbT9bs
-vSQHK+Z+iIih3FLYhbjWj5qM+QHKy3v7Zck9XVB3NgzudtrAS4Wqrk6loVZjUD2B
-++d/1iWVmQcBYzTKiffe1tUJHfjR5M0KrZ/Art+H+OTJBCUoFOZUoa1iCYbufZ+o
-Bd91xUK4sOz7w9vf/SM59bDNZ3dHaxU2bNI0uP4j0D0EjDvkrphr6V2Z+zEH6ZFK
-/oY7baoRmZxFePrnzPTnUcZc10skNBfSg0SzEbpFfKWlDYX1o/Bf8aW6dCrUKWhL
-xtSuwlTZFyYQ3YKcLM0XKJHVk9Ul+uoGZgWWX6pLnWg/Jocmzd61NE8j6v7TKN9c
-XYZWK89CL23aeqAK1AYatQ3aQP31iofjYziFH8PVGnRGXJe6pBV98DkURH4EfN1h
-YF53R+ANwkAbon5vn9AguQ==
-=b0up
+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
+BzhK
+=aQ9x
 -----END PGP MESSAGE-----

config/secrets.nix

@@ -66,6 +66,9 @@
     ap63.password = "encrypted";
     ap64.password = "encrypted";
     ap65.password = "encrypted";
+    ap66.password = "encrypted";
+    ap67.password = "encrypted";
+    ap68.password = "encrypted";
     switch-a1.password = "encrypted";
     switch-b1.password = "encrypted";
     switch-b2.password = "encrypted";
@@ -282,6 +285,14 @@
       "pci0000:00/0000:00:00.0".ssids."Buschfunk4.03".psk = "encrypted";
       "platform/ahb/18100000.wmac".ssids."Buschfunk4.03 legacy".psk = "encrypted";
     };
+    ap67.wifi = {
+      "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";
+    };
+    ap68.wifi = {
+      "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";
+    };
     ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted";
     ap8.wifi = {
       "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted";

config/switch.nix

@@ -133,7 +133,6 @@
         ap11.ports = [ "ge-1/0/10" ];
         ap34.ports = [ "ge-1/0/12" ];
         ap18.ports = [ "ge-1/0/18" ];
-        ap24.ports = [ "ge-1/0/34" ];
         ap29.ports = [ "ge-0/0/46" ];
         ap30.ports = [ "ge-1/0/22" ];
         ap35.ports = [ "ge-1/0/23" ];
@@ -174,7 +173,8 @@
         priv24.ports = [ "ge-0/0/6" "ge-1/0/16" ];
         priv3.ports = [ "ge-1/0/5" ];
         priv30.ports = [ "ge-0/0/12" ];
-        priv12.ports = [ "ge-1/0/35" ];
+        ap67.ports = [ "ge-1/0/34" ];
+        ap68.ports = [ "ge-1/0/35" ];
         ap64.ports = [ "ge-0/0/45" ];
         pub.ports = [
           "ge-1/0/11"