diff --git a/config/ap.nix b/config/ap.nix index 581b75c..a47d3f8 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -1809,7 +1809,45 @@ ap57.ports = [ "ap57" ]; }; }; - ap59 = { }; + ap59 = { + interfaces = { + mgmt = { + gw4 = "mgmt-gw"; + gw6 = "mgmt-gw"; + type = "phys"; + }; + pub.type = "bridge"; + }; + links = { + priv21 = { + ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ]; + }; + switch-d1 = { + ports = [ "wan" ]; + }; + }; + location = "Turm D, Erdgeschoss"; + model = "archer-c7-v5"; + role = "ap"; + wifi = { + "pci0000:00/0000:00:00.0" = { + channel = 36; + htmode = "VHT80"; + ssids = { + "ZW public" = { net = "pub"; }; + "Ebs 5000" = { net = "priv21"; }; + }; + }; + "platform/ahb/18100000.wmac" = { + channel = 6; + htmode = "HT40-"; + ssids = { + "ZW public" = { net = "pub"; }; + "Ebs 2000" = { net = "priv21"; }; + }; + }; + }; + }; ap6 = { interfaces = { mgmt = { diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index 46ffc9a..9b247f8 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,63 +1,64 @@ -----BEGIN PGP MESSAGE----- -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 -bIdImjqRuOSoHB0R73LazvfeMWfZUDw= -=B5Ak +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 +PfYHB19OMQUXqA== +=nr9y -----END PGP MESSAGE----- diff --git a/config/secrets.nix b/config/secrets.nix index 07103f0..bc51312 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -59,6 +59,7 @@ ap56.password = "encrypted"; ap57.password = "encrypted"; ap58.password = "encrypted"; + ap59.password = "encrypted"; switch-a1.password = "encrypted"; switch-b1.password = "encrypted"; switch-b2.password = "encrypted"; @@ -243,6 +244,10 @@ "pci0000:00/0000:00:00.0".ssids."Zentralwerk".psk = "encrypted"; "platform/ahb/18100000.wmac".ssids."LIZA".psk = "encrypted"; }; + ap59.wifi = { + "pci0000:00/0000:00:00.0".ssids."Ebs 5000".psk = "encrypted"; + "platform/ahb/18100000.wmac".ssids."Ebs 2000".psk = "encrypted"; + }; ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted"; ap8.wifi = { "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted";