steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

chore: remove and extend info on TODO comments

Browse source
This commit is contained in:
steveej 2023-12-26 22:44:11 +01:00
parent 2aacd144b1
commit 5299051f86
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nix/os/devices/router0-dmz0/configuration.nix
View file

@ -86,9 +86,6 @@ in {
nix.settings.cores = lib.mkDefault 0; nix.settings.cores = lib.mkDefault 0;
} }
# TODO
# ./network.nix
# ./monitoring.nix
{ {
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.settings.PermitRootLogin = "yes"; services.openssh.settings.PermitRootLogin = "yes";
@ -396,7 +393,6 @@ in {
} }
# configuration for the hostapd dynamic interfaces # configuration for the hostapd dynamic interfaces
# TODO: refactor this to configure the following per vlanid
# * netdev type vlan # * netdev type vlan
# * host address for vlan # * host address for vlan
# * vlan config for wlan interface # * vlan config for wlan interface
@ -405,8 +401,9 @@ in {
(acc: cur: acc // cur) (acc: cur: acc // cur)
{} {}
(builtins.map ({ vlanid, vlanid' }: { (builtins.map ({ vlanid, vlanid' }: {
# set an address on the tagged br-lan device. # configure the tagged vlan device with an address and vlan filtering.
# this address will be picked up by dnsmasq. # dnsmasq is configured to serve the respective /24 range on each tagged device.
# this device only receives traffic for the given vlanid and sends tagged traffic to the bridge.
"41-br-lan.${vlanid'}" = { "41-br-lan.${vlanid'}" = {
matchConfig.Name = "br-lan.${vlanid'}"; matchConfig.Name = "br-lan.${vlanid'}";
address = [ address = [
@ -422,7 +419,6 @@ in {
bridgeVLANs = [ bridgeVLANs = [
{ {
bridgeVLANConfig = { bridgeVLANConfig = {
# TODO debug this: each vlanid is native to each port
VLAN = vlanid; VLAN = vlanid;
}; };
} }
@ -445,7 +441,6 @@ in {
bridgeVLANs = [ bridgeVLANs = [
{ {
bridgeVLANConfig = { bridgeVLANConfig = {
# TODO debug this: each vlanid is native to each port
VLAN = vlanid; VLAN = vlanid;
PVID = vlanid; PVID = vlanid;
EgressUntagged = vlanid; EgressUntagged = vlanid;
@ -463,16 +458,6 @@ in {
ConfigureWithoutCarrier = true; ConfigureWithoutCarrier = true;
}; };
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
bridgeVLANs = [
{
bridgeVLANConfig = {
# TODO debug this: each vlanid is native to each port
VLAN = vlanid;
PVID = vlanid;
};
}
];
}; };
}) })
(builtins.map (builtins.map