diff --git a/config/ap.nix b/config/ap.nix index 8429c80..6f63951 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -769,25 +769,32 @@ type = "phys"; }; pub.type = "bridge"; + priv10.type = "bridge"; }; links = { - ap42 = { + switch-b3 = { ports = [ "lan" ]; }; }; - location = "Hof (temporary)"; + location = "B4.09.01"; model = "ubnt_unifiac-lite"; role = "ap"; wifi = { "pci0000:00/0000:00:00.0" = { channel = 149; htmode = "VHT80"; - ssids = { "ZW public" = { net = "pub"; }; }; + ssids = { + "ZW public" = { net = "pub"; }; + etz250 = { net = "priv10"; }; + }; }; "platform/ahb/18100000.wmac" = { channel = 9; htmode = "HT40+"; - ssids = { "ZW public" = { net = "pub"; }; }; + ssids = { + "ZW public" = { net = "pub"; }; + etz250 = { net = "priv10"; }; + }; }; }; }; diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index de0cc0d..a55b0c7 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,69 +1,69 @@ -----BEGIN PGP MESSAGE----- -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 -=lCz/ +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 +=8Mkm -----END PGP MESSAGE----- diff --git a/config/secrets.nix b/config/secrets.nix index 3c0a023..a336795 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -142,6 +142,8 @@ "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted"; "platform/ahb/18100000.wmac".ssids."C3D2 legacy".psk = "encrypted"; }; + ap34.wifi."pci0000:00/0000:00:00.0".ssids."etz250".psk = "encrypted"; + ap34.wifi."platform/ahb/18100000.wmac".ssids."etz250".psk = "encrypted"; ap35.wifi."platform/ahb/18100000.wmac".ssids."Koch".psk = "encrypted"; ap36.wifi."platform/ar933x_wmac".ssids."C3D2 legacy".psk = "encrypted"; ap37.wifi = { diff --git a/config/switch.nix b/config/switch.nix index 7a092ec..be75643 100644 --- a/config/switch.nix +++ b/config/switch.nix @@ -102,7 +102,7 @@ ap1.ports = [ "ge-1/0/8" ]; ap11.ports = [ "ge-1/0/10" ]; - ap15.ports = [ "ge-1/0/12" ]; + ap34.ports = [ "ge-1/0/12" ]; ap18.ports = [ "ge-1/0/18" ]; ap24.ports = [ "ge-1/0/34" ]; ap25.ports = [ "ge-1/0/35" ]; diff --git a/contact.md.asc b/contact.md.asc index 784ec74..7261e86 100644 Binary files a/contact.md.asc and b/contact.md.asc differ