diff --git a/config/ap.nix b/config/ap.nix index d8f34ab..1d670fb 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -461,7 +461,7 @@ ports = [ "wan" ]; }; }; - location = "Farbwerk"; + location = "Farbwerk, lost"; model = "tl-wr740n-v1"; role = "ap"; wifi = { @@ -2026,6 +2026,41 @@ }; }; }; + ap65 = { + interfaces = { + mgmt = { + gw4 = "mgmt-gw"; + gw6 = "mgmt-gw"; + type = "phys"; + }; + priv12.type = "bridge"; + pub.type = "bridge"; + }; + links = { + switch-b3.ports = [ "lan" ]; + }; + location = "El Perro"; + model = "ubnt_unifi-6-lite"; + role = "ap"; + wifi = { + "1e140000.pcie/pci0000:00/0000:00:00.0/0000:01: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" = { + channel = 149; + htmode = "VHT80"; + ssids = { + "ZW public" = { net = "pub"; }; + farbwerk = { net = "priv12"; }; + }; + }; + }; + }; ap7 = { interfaces = { mgmt = { diff --git a/config/net/mgmt.nix b/config/net/mgmt.nix index eefb7e9..797bb4b 100644 --- a/config/net/mgmt.nix +++ b/config/net/mgmt.nix @@ -63,6 +63,7 @@ ap62 = "10.0.0.102"; ap63 = "10.0.0.103"; ap64 = "10.0.0.104"; + ap65 = "10.0.0.105"; ap7 = "10.0.0.47"; ap8 = "10.0.0.48"; ap9 = "10.0.0.49"; @@ -163,6 +164,7 @@ ap62 = "fd23:42:c3d2:580::4:3e"; ap63 = "fd23:42:c3d2:580::4:3f"; ap64 = "fd23:42:c3d2:580::4:40"; + ap65 = "fd23:42:c3d2:580::4:41"; ap7 = "fd23:42:c3d2:580::4:7"; ap8 = "fd23:42:c3d2:580::4:8"; ap9 = "fd23:42:c3d2:580::4:9"; diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index 6d1ecf6..2edd852 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,78 +1,79 @@ -----BEGIN PGP MESSAGE----- -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 -=lSzz +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 +S7b9ct4= +=8pzH -----END PGP MESSAGE----- diff --git a/config/secrets.nix b/config/secrets.nix index ad6f321..b4f7b55 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -65,6 +65,7 @@ ap61.password = "encrypted"; ap63.password = "encrypted"; ap64.password = "encrypted"; + ap65.password = "encrypted"; switch-a1.password = "encrypted"; switch-b1.password = "encrypted"; switch-b2.password = "encrypted"; @@ -273,6 +274,10 @@ ap64.wifi = { "platform/ahb/18100000.wmac".ssids."Princess Castle".psk = "encrypted"; }; + ap65.wifi = { + "1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0".ssids."farbwerk".psk = "encrypted"; + "1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0".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"; diff --git a/config/switch.nix b/config/switch.nix index 419803e..512bed9 100644 --- a/config/switch.nix +++ b/config/switch.nix @@ -134,7 +134,6 @@ ap34.ports = [ "ge-1/0/12" ]; ap18.ports = [ "ge-1/0/18" ]; ap24.ports = [ "ge-1/0/34" ]; - ap25.ports = [ "ge-1/0/35" ]; ap29.ports = [ "ge-0/0/46" ]; ap30.ports = [ "ge-1/0/22" ]; ap35.ports = [ "ge-1/0/23" ]; @@ -151,6 +150,7 @@ ap56.ports = [ "ge-1/0/9" ]; ap60.ports = [ "ge-1/0/20" ]; ap62.ports = [ "ge-0/0/11" ]; + ap65.ports = [ "ge-0/0/9" ]; mgmt.ports = [ "ge-0/0/0" "ge-0/0/1" @@ -173,7 +173,7 @@ 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-0/0/9" ]; + priv12.ports = [ "ge-1/0/35" ]; ap64.ports = [ "ge-0/0/45" ]; pub.ports = [ "ge-1/0/11"