mirror of
https://github.com/oddlama/nix-config.git
synced 2025-10-10 23:00:39 +02:00
fix(topology): work around network propagator not knowing about mkMerge
This commit is contained in:
parent
1d207e0fd2
commit
beb50045b4
8 changed files with 26 additions and 27 deletions
|
@ -210,17 +210,12 @@
|
|||
connections.wan1 = mkConnectionRev "internet" "*";
|
||||
};
|
||||
|
||||
# TODO: extract from kea!
|
||||
networks.home-lan = {
|
||||
name = "Home LAN";
|
||||
cidrv4 = "192.168.1.0/24";
|
||||
};
|
||||
|
||||
networks.home-fritzbox = {
|
||||
name = "Home Fritzbox";
|
||||
cidrv4 = "192.168.178.0/24";
|
||||
};
|
||||
|
||||
networks.ward-kea.name = "Home LAN";
|
||||
nodes.switch-attic = mkSwitch "Switch Attic" {
|
||||
info = "D-Link DGS-1016D";
|
||||
image = ./dlink-dgs1016d.png;
|
||||
|
@ -240,7 +235,6 @@
|
|||
};
|
||||
})
|
||||
{
|
||||
nodes.ward.interfaces.lan.network = "home-lan";
|
||||
nodes.fritzbox.interfaces.eth1.network = "home-fritzbox";
|
||||
}
|
||||
];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue