zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

Revert "Add ddns-update-on-renew option and higher lease time" 

This reverts commit 5e36c91ef6.

This is very bad for DynDNS and our DNS servers.
This commit is contained in:
Astro 2024-04-18 19:20:53 +02:00
parent 579fe9226d
commit dc4cfef526
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/net/priv.nix
View File

@ -16,10 +16,9 @@ lib.mkMerge (
site.net."priv${toString n}" = { site.net."priv${toString n}" = {
dhcp = { dhcp = {
server = "priv${toString n}-gw"; server = "priv${toString n}-gw";
time = 900; time = 300;
max-time = 60 * 24 * 3600; max-time = 60 * 24 * 3600;
router = "priv${toString n}-gw"; router = "priv${toString n}-gw";
updateOnRenewal = true;
}; };
domainName = "priv${toString n}.zentralwerk.org"; domainName = "priv${toString n}.zentralwerk.org";
dynamicDomain = true; dynamicDomain = true;

5
nix/lib/config/options.nix
View File

@ -96,11 +96,6 @@ let
type = with types; attrsOf str; type = with types; attrsOf str;
default = {}; default = {};
}; };
updateOnRenewal = mkOption {
type = types.bool;
default = false;
description = "Update DNS entry on renewal";
};
}; };
netOpts = { name, ... }: { netOpts = { name, ... }: {

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

@ -29,10 +29,6 @@ in
# TODO: use with kea >= 2.5.0 # TODO: use with kea >= 2.5.0
# ddns-conflict-resolution-mode = "check-exists-with-dhcid"; # ddns-conflict-resolution-mode = "check-exists-with-dhcid";
ddns-use-conflict-resolution = false; ddns-use-conflict-resolution = false;
ddns-replace-client-name = "when-not-present";
# fix old, wrong or lost dns entries on renewal
ddns-update-on-renew = builtins.any (a: a)
(concatMapDhcpNets (net: { dhcp, ... }: dhcp.updateOnRenewal));
expired-leases-processing.hold-reclaimed-time = builtins.foldl' lib.max expired-leases-processing.hold-reclaimed-time = builtins.foldl' lib.max
3600 (concatMapDhcpNets (net: { dhcp, ... }: dhcp.max-time)); 3600 (concatMapDhcpNets (net: { dhcp, ... }: dhcp.max-time));
@ -42,8 +38,8 @@ in
pools = [ { pools = [ {
pool = "${dhcp.start} - ${dhcp.end}"; pool = "${dhcp.start} - ${dhcp.end}";
} ]; } ];
renew-timer = builtins.ceil (0.5 * dhcp.time); renew-timer = builtins.ceil (.5 * dhcp.time);
rebind-timer = builtins.ceil (0.85 * dhcp.time); rebind-timer = builtins.ceil (.85 * dhcp.time);
valid-lifetime = dhcp.time; valid-lifetime = dhcp.time;
option-data = [ { option-data = [ {
space = "dhcp4"; space = "dhcp4";