diff --git a/config/net/c3d2.nix b/config/net/c3d2.nix index a874c85..00fd244 100644 --- a/config/net/c3d2.nix +++ b/config/net/c3d2.nix @@ -56,7 +56,7 @@ # "riscbert" = "6c:cf:39:00:05:95"; }; time = 300; - max-time = 24 * 3600; + max-time = 30 * 24 * 3600; router = "c3d2-gw3"; }; domainName = "c3d2.zentralwerk.org"; diff --git a/config/net/priv.nix b/config/net/priv.nix index c1e7a51..7dd1a2d 100644 --- a/config/net/priv.nix +++ b/config/net/priv.nix @@ -17,7 +17,7 @@ lib.mkMerge ( dhcp = { server = "priv${toString n}-gw"; time = 300; - max-time = 14 * 24 * 3600; + max-time = 60 * 24 * 3600; router = "priv${toString n}-gw"; }; domainName = "priv${toString n}.zentralwerk.org"; diff --git a/config/net/pub.nix b/config/net/pub.nix index 1a6765f..66135e5 100644 --- a/config/net/pub.nix +++ b/config/net/pub.nix @@ -5,7 +5,7 @@ end = "172.20.79.253"; router = "pub-gw"; server = "pub-gw"; - time = 300; + time = 120; max-time = 12 * 3600; }; domainName = "pub.zentralwerk.org"; diff --git a/nix/nixos-module/container/dhcp-server.nix b/nix/nixos-module/container/dhcp-server.nix index 7abaa50..aa5ff07 100644 --- a/nix/nixos-module/container/dhcp-server.nix +++ b/nix/nixos-module/container/dhcp-server.nix @@ -36,9 +36,8 @@ in pools = [ { pool = "${dhcp.start} - ${dhcp.end}"; } ]; - renew-timer = dhcp.time / 2; - rebind-timer = dhcp.time; - valid-lifetime = dhcp.max-time; + valid-lifetime = dhcp.time; + max-valid-lifetime = dhcp.max-time; option-data = [ { space = "dhcp4"; name = "routers"; @@ -199,9 +198,8 @@ in pool = "${prefix}:c3d2:c3d2:c3d2:1000 - ${prefix}:c3d2:c3d2:c3d2:ffff"; #pool = subnet; } ]; - renew-timer = dhcp.time / 2; - rebind-timer = dhcp.time; - valid-lifetime = dhcp.max-time; + valid-lifetime = dhcp.time; + max-valid-lifetime = dhcp.max-time; #option-data = [ { # space = "dhcp6"; # name = "domain-search";