Compare commits
3 Commits
579fe9226d
...
42e2fd8681
Author | SHA1 | Date |
---|---|---|
Astro | 42e2fd8681 | |
Astro | e19caf29ba | |
Astro | dc4cfef526 |
|
@ -139,8 +139,6 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
ap13 = { };
|
||||
ap14 = { };
|
||||
ap15 = {
|
||||
interfaces = {
|
||||
mgmt = {
|
||||
|
@ -173,7 +171,6 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
ap16 = { };
|
||||
ap17 = {
|
||||
interfaces = {
|
||||
mgmt = {
|
||||
|
|
|
@ -16,10 +16,9 @@ lib.mkMerge (
|
|||
site.net."priv${toString n}" = {
|
||||
dhcp = {
|
||||
server = "priv${toString n}-gw";
|
||||
time = 900;
|
||||
time = 300;
|
||||
max-time = 60 * 24 * 3600;
|
||||
router = "priv${toString n}-gw";
|
||||
updateOnRenewal = true;
|
||||
};
|
||||
domainName = "priv${toString n}.zentralwerk.org";
|
||||
dynamicDomain = true;
|
||||
|
@ -242,6 +241,7 @@ lib.mkMerge (
|
|||
"172.20.73.163" = "b8:27:eb:16:31:61";
|
||||
"172.20.73.164" = "ca:71:c4:90:3e:c7";
|
||||
};
|
||||
time = 300;
|
||||
};
|
||||
};
|
||||
priv24 = {
|
||||
|
|
|
@ -96,11 +96,6 @@ let
|
|||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
};
|
||||
updateOnRenewal = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Update DNS entry on renewal";
|
||||
};
|
||||
};
|
||||
|
||||
netOpts = { name, ... }: {
|
||||
|
|
|
@ -29,10 +29,6 @@ in
|
|||
# TODO: use with kea >= 2.5.0
|
||||
# ddns-conflict-resolution-mode = "check-exists-with-dhcid";
|
||||
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
|
||||
3600 (concatMapDhcpNets (net: { dhcp, ... }: dhcp.max-time));
|
||||
|
||||
|
@ -42,8 +38,8 @@ in
|
|||
pools = [ {
|
||||
pool = "${dhcp.start} - ${dhcp.end}";
|
||||
} ];
|
||||
renew-timer = builtins.ceil (0.5 * dhcp.time);
|
||||
rebind-timer = builtins.ceil (0.85 * dhcp.time);
|
||||
renew-timer = builtins.ceil (.5 * dhcp.time);
|
||||
rebind-timer = builtins.ceil (.85 * dhcp.time);
|
||||
valid-lifetime = dhcp.time;
|
||||
option-data = [ {
|
||||
space = "dhcp4";
|
||||
|
|
Loading…
Reference in New Issue