forked from zentralwerk/network
pkgs/ap: delete unused networks
This commit is contained in:
parent
25217f0b82
commit
b8b4995433
|
@ -160,7 +160,7 @@ in ''
|
||||||
'') config.site.sshPubKeys}
|
'') config.site.sshPubKeys}
|
||||||
|
|
||||||
# System configuration
|
# System configuration
|
||||||
${uciDeleteAll "switch.@switch_vlan"}
|
${uciDeleteAll "network.@switch_vlan"}
|
||||||
${uciDeleteAll "wireless.@wifi"}
|
${uciDeleteAll "wireless.@wifi"}
|
||||||
|
|
||||||
uci batch <<__UCI__
|
uci batch <<__UCI__
|
||||||
|
@ -169,13 +169,6 @@ in ''
|
||||||
set system.@system[0].log_ip=${config.site.net.mgmt.hosts4.logging}
|
set system.@system[0].log_ip=${config.site.net.mgmt.hosts4.logging}
|
||||||
set system.@system[0].log_proto=udp
|
set system.@system[0].log_proto=udp
|
||||||
|
|
||||||
delete network.globals.ula_prefix
|
|
||||||
delete network.lan
|
|
||||||
delete network.wan
|
|
||||||
delete network.wan6
|
|
||||||
delete wireless.default_radio0
|
|
||||||
delete wireless.default_radio1
|
|
||||||
|
|
||||||
# Switch config
|
# Switch config
|
||||||
${optionalString hasSwitch ''
|
${optionalString hasSwitch ''
|
||||||
# Ports ${portsDoc}
|
# Ports ${portsDoc}
|
||||||
|
@ -214,6 +207,14 @@ in ''
|
||||||
add_list network.mgmt.dns=${config.site.net.serv.hosts4.dnscache}
|
add_list network.mgmt.dns=${config.site.net.serv.hosts4.dnscache}
|
||||||
add_list network.mgmt.dns=${config.site.net.serv.hosts6.dn42.dnscache}
|
add_list network.mgmt.dns=${config.site.net.serv.hosts6.dn42.dnscache}
|
||||||
|
|
||||||
|
delete network.globals.ula_prefix
|
||||||
|
# delete unused networks
|
||||||
|
${concatMapStrings (net:
|
||||||
|
lib.optionalString (! hostConfig.interfaces ? ${net}) ''
|
||||||
|
delete network.${net}
|
||||||
|
''
|
||||||
|
) ([ "lan" "wan" "wan6" ] ++ builtins.attrNames config.site.net)}
|
||||||
|
|
||||||
# bridged networks
|
# bridged networks
|
||||||
${concatMapStrings (net:
|
${concatMapStrings (net:
|
||||||
let
|
let
|
||||||
|
@ -227,6 +228,8 @@ in ''
|
||||||
'') (builtins.attrNames hostConfig.interfaces)
|
'') (builtins.attrNames hostConfig.interfaces)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete wireless.default_radio0
|
||||||
|
delete wireless.default_radio1
|
||||||
${concatStrings (imap0 (index: path:
|
${concatStrings (imap0 (index: path:
|
||||||
let
|
let
|
||||||
radioConfig = hostConfig.wifi.${path};
|
radioConfig = hostConfig.wifi.${path};
|
||||||
|
@ -234,7 +237,6 @@ in ''
|
||||||
then "wlan2"
|
then "wlan2"
|
||||||
else "wlan5";
|
else "wlan5";
|
||||||
in ''
|
in ''
|
||||||
set wireless.radio${toString index}=wifi-device
|
|
||||||
set wireless.radio${toString index}=wifi-device
|
set wireless.radio${toString index}=wifi-device
|
||||||
set wireless.radio${toString index}.type=mac80211
|
set wireless.radio${toString index}.type=mac80211
|
||||||
set wireless.radio${toString index}.country=DE
|
set wireless.radio${toString index}.country=DE
|
||||||
|
|
Loading…
Reference in New Issue