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

pkgs/openwrt: enable wpa3 and owe

This commit is contained in:
Astro 2022-09-12 21:41:40 +02:00
parent 4bbd7b6bee
commit f89d1fcffb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nix/pkgs/openwrt/default.nix
View File

@ -72,6 +72,9 @@ in rec {
# monitoring # monitoring
"collectd" "collectd-mod-interface" "collectd-mod-load" "collectd" "collectd-mod-interface" "collectd-mod-load"
"collectd-mod-cpu" "collectd-mod-iwinfo" "collectd-mod-network" "collectd-mod-cpu" "collectd-mod-iwinfo" "collectd-mod-network"
# wpa3
"-wpad-basic-wolfssl"
"wpad-openssl"
] ++ modelPackages.${model} or []; ] ++ modelPackages.${model} or [];
disabledServices = [ "dnsmasq" "uhttpd" ]; disabledServices = [ "dnsmasq" "uhttpd" ];
files = pkgs.runCommandNoCC "image-files" {} '' files = pkgs.runCommandNoCC "image-files" {} ''

4
nix/pkgs/openwrt/uci-config.nix
View File

@ -277,11 +277,11 @@ in
uci set wireless.@wifi-iface[-1].mcast_rate=18000 uci set wireless.@wifi-iface[-1].mcast_rate=18000
${if (ssidConfig.psk != null) ${if (ssidConfig.psk != null)
then '' then ''
uci set wireless.@wifi-iface[-1].encryption=psk2 uci set wireless.@wifi-iface[-1].encryption='sae-mixed'
uci set wireless.@wifi-iface[-1].key='${ssidConfig.psk}' uci set wireless.@wifi-iface[-1].key='${ssidConfig.psk}'
'' ''
else '' else ''
uci set wireless.@wifi-iface[-1].encryption=none uci set wireless.@wifi-iface[-1].encryption='owe'
uci -q delete wireless.@wifi-iface[-1].key || true uci -q delete wireless.@wifi-iface[-1].key || true
''} ''}
'' ''