winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nixos-module/container/dhcp-server: use the proper max-valid-lifetime parameter instead of calculating timers

This commit is contained in:
Astro 2023-11-13 22:44:38 +01:00
parent 6c6c6f30b0
commit c40997bacc
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/net/c3d2.nix
View File

@ -56,7 +56,7 @@
# "riscbert" = "6c:cf:39:00:05:95"; # "riscbert" = "6c:cf:39:00:05:95";
}; };
time = 300; time = 300;
max-time = 24 * 3600; max-time = 30 * 24 * 3600;
router = "c3d2-gw3"; router = "c3d2-gw3";
}; };
domainName = "c3d2.zentralwerk.org"; domainName = "c3d2.zentralwerk.org";

2
config/net/priv.nix
View File

@ -17,7 +17,7 @@ lib.mkMerge (
dhcp = { dhcp = {
server = "priv${toString n}-gw"; server = "priv${toString n}-gw";
time = 300; time = 300;
max-time = 14 * 24 * 3600; max-time = 60 * 24 * 3600;
router = "priv${toString n}-gw"; router = "priv${toString n}-gw";
}; };
domainName = "priv${toString n}.zentralwerk.org"; domainName = "priv${toString n}.zentralwerk.org";

2
config/net/pub.nix
View File

@ -5,7 +5,7 @@
end = "172.20.79.253"; end = "172.20.79.253";
router = "pub-gw"; router = "pub-gw";
server = "pub-gw"; server = "pub-gw";
time = 300; time = 120;
max-time = 12 * 3600; max-time = 12 * 3600;
}; };
domainName = "pub.zentralwerk.org"; domainName = "pub.zentralwerk.org";

10
nix/nixos-module/container/dhcp-server.nix
View File

@ -36,9 +36,8 @@ in
pools = [ { pools = [ {
pool = "${dhcp.start} - ${dhcp.end}"; pool = "${dhcp.start} - ${dhcp.end}";
} ]; } ];
renew-timer = dhcp.time / 2; valid-lifetime = dhcp.time;
rebind-timer = dhcp.time; max-valid-lifetime = dhcp.max-time;
valid-lifetime = dhcp.max-time;
option-data = [ { option-data = [ {
space = "dhcp4"; space = "dhcp4";
name = "routers"; name = "routers";
@ -199,9 +198,8 @@ in
pool = "${prefix}:c3d2:c3d2:c3d2:1000 - ${prefix}:c3d2:c3d2:c3d2:ffff"; pool = "${prefix}:c3d2:c3d2:c3d2:1000 - ${prefix}:c3d2:c3d2:c3d2:ffff";
#pool = subnet; #pool = subnet;
} ]; } ];
renew-timer = dhcp.time / 2; valid-lifetime = dhcp.time;
rebind-timer = dhcp.time; max-valid-lifetime = dhcp.max-time;
valid-lifetime = dhcp.max-time;
#option-data = [ { #option-data = [ {
# space = "dhcp6"; # space = "dhcp6";
# name = "domain-search"; # name = "domain-search";