zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 4 Pull Requests 1 Releases Wiki Activity

options, saal aps: turn ZW public back to no encryption, add ssid Datenspuren for owe

This commit is contained in:
Astro 2022-09-16 18:57:16 +02:00
parent 4923f7e3ca
commit 0002456abf
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
config/ap.nix
View File

@ -1150,7 +1150,7 @@
channel = 1; channel = 1;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1158,7 +1158,8 @@
channel = 36; channel = 36;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1187,7 +1188,7 @@
channel = 5; channel = 5;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1195,7 +1196,8 @@
channel = 149; channel = 149;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1226,7 +1228,7 @@
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
EWW = { net = "priv36"; }; EWW = { net = "priv36"; };
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1235,7 +1237,8 @@
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
EWW = { net = "priv36"; }; EWW = { net = "priv36"; };
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1264,7 +1267,7 @@
channel = 1; channel = 1;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1272,7 +1275,8 @@
channel = 149; channel = 149;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1301,7 +1305,7 @@
channel = 5; channel = 5;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1309,7 +1313,8 @@
channel = 36; channel = 36;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1338,7 +1343,7 @@
channel = 9; channel = 9;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1346,7 +1351,8 @@
channel = 149; channel = 149;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1408,7 +1414,7 @@
channel = 1; channel = 1;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
gerdwork = { net = "priv32"; }; gerdwork = { net = "priv32"; };
}; };
@ -1417,7 +1423,8 @@
channel = 36; channel = 36;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };
@ -1486,7 +1493,7 @@
channel = 9; channel = 9;
htmode = "HT20"; htmode = "HT20";
ssids = { ssids = {
"ZW public legacy" = { net = "pub"; encryption = "none"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"ZW stage legacy" = { net = "priv25"; }; "ZW stage legacy" = { net = "priv25"; };
}; };
}; };
@ -1494,7 +1501,8 @@
channel = 149; channel = 149;
htmode = "VHT80"; htmode = "VHT80";
ssids = { ssids = {
"ZW public" = { net = "pub"; }; "ZW public" = { net = "pub"; encryption = "none"; };
"Datenspuren" = { net = "pub"; encryption = "owe"; };
"ZW stage" = { net = "priv25"; }; "ZW stage" = { net = "priv25"; };
}; };
}; };

2
nix/lib/config/options.nix
View File

@ -455,7 +455,7 @@ let
type = enum [ "none" "owe" "wpa2" "wpa3" ]; type = enum [ "none" "owe" "wpa2" "wpa3" ];
default = default =
if config.psk == null if config.psk == null
then "owe" then "none"
else "wpa3"; else "wpa3";
}; };
mode = mkOption { mode = mkOption {