Compare commits
2 Commits
feature/ro
...
feature/ro
Author | SHA1 | Date | |
---|---|---|---|
9760d1f8c8
|
|||
bc7fb86f2c
|
@@ -50,6 +50,7 @@ let
|
||||
addr4 = "192.168.1.61";
|
||||
addr4Sized = "${addr4}/24";
|
||||
gw4 = "192.168.1.254";
|
||||
gw6 = "fe80::e21f:2bff:fe96:e952";
|
||||
};
|
||||
lan = mkIfConfig {
|
||||
name_ = "lan";
|
||||
@@ -369,7 +370,7 @@ in
|
||||
};
|
||||
|
||||
netdevs = {
|
||||
"10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
|
||||
# "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
|
||||
"10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
|
||||
"10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
|
||||
"10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
|
||||
@@ -387,13 +388,16 @@ in
|
||||
Address = [ ifs.wan.addr4Sized ];
|
||||
IPv6AcceptRA = false;
|
||||
};
|
||||
routes = [ { Gateway = ifs.wan.gw4; } ];
|
||||
routes = [
|
||||
{ Gateway = ifs.wan.gw4; }
|
||||
{ Gateway = ifs.wan.gw6; }
|
||||
];
|
||||
# make routing on this interface a dependency for network-online.target
|
||||
linkConfig.RequiredForOnline = "routable";
|
||||
};
|
||||
"20-lan" = (mkLanConfig ifs.lan) // {
|
||||
vlan = [
|
||||
ifs.lan10.name
|
||||
# ifs.lan10.name
|
||||
ifs.lan20.name
|
||||
ifs.lan30.name
|
||||
ifs.lan40.name
|
||||
@@ -417,23 +421,23 @@ in
|
||||
};
|
||||
|
||||
networking.interfaces = {
|
||||
${ifs.lan10.name} = {
|
||||
ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
|
||||
ipv6.addresses = [
|
||||
{
|
||||
address = ifs.lan10.addr6;
|
||||
prefixLength = ifs.lan10.p6Size;
|
||||
}
|
||||
{
|
||||
address = ifs.lan10.ulaAddr;
|
||||
prefixLength = ifs.lan10.ulaSize;
|
||||
}
|
||||
];
|
||||
};
|
||||
# ${ifs.lan10.name} = {
|
||||
# ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
|
||||
# ipv6.addresses = [
|
||||
# {
|
||||
# address = ifs.lan10.addr6;
|
||||
# prefixLength = ifs.lan10.p6Size;
|
||||
# }
|
||||
# {
|
||||
# address = ifs.lan10.ulaAddr;
|
||||
# prefixLength = ifs.lan10.ulaSize;
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
|
||||
|
||||
services.radvd.enable = true;
|
||||
services.radvd.enable = false;
|
||||
services.radvd.config = ''
|
||||
interface ${ifs.lan10.name} {
|
||||
RDNSS ${ifs.lan.ulaAddr} {
|
||||
@@ -609,7 +613,7 @@ in
|
||||
services.kea.dhcp4.settings = {
|
||||
interfaces-config.interfaces = [
|
||||
ifs.lan.name
|
||||
ifs.lan10.name
|
||||
# ifs.lan10.name
|
||||
ifs.lan20.name
|
||||
ifs.lan30.name
|
||||
ifs.lan40.name
|
||||
@@ -619,7 +623,7 @@ in
|
||||
ddns-qualifying-suffix = "4.default.${ldomain}";
|
||||
subnet4 = [
|
||||
((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
|
||||
(mkDhcp4Subnet 10 ifs.lan10)
|
||||
# (mkDhcp4Subnet 10 ifs.lan10)
|
||||
((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
|
||||
(mkDhcp4Subnet 30 ifs.lan30)
|
||||
(mkDhcp4Subnet 40 ifs.lan40)
|
||||
@@ -631,7 +635,7 @@ in
|
||||
services.kea.dhcp6.settings = {
|
||||
interfaces-config.interfaces = [
|
||||
ifs.lan.name
|
||||
ifs.lan10.name
|
||||
# ifs.lan10.name
|
||||
# ifs.lan20.name # Managed by Att box
|
||||
ifs.lan30.name
|
||||
ifs.lan40.name
|
||||
@@ -642,7 +646,7 @@ in
|
||||
ddns-qualifying-suffix = "6.default.${ldomain}";
|
||||
subnet6 = [
|
||||
((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
|
||||
(mkDhcp6Subnet 10 ifs.lan10)
|
||||
# (mkDhcp6Subnet 10 ifs.lan10)
|
||||
(mkDhcp6Subnet 30 ifs.lan30)
|
||||
(mkDhcp6Subnet 40 ifs.lan40)
|
||||
(mkDhcp6Subnet 50 ifs.lan50)
|
||||
|
Reference in New Issue
Block a user