Merge pull request #166189 from jmbaur/dhcpd6-reserved-addresses
nixos/dhcpd6: Use fixed-address6 for dhcpd6 address reservations
This commit is contained in:
commit
18071b3d1a
|
@ -7,7 +7,7 @@ let
|
||||||
cfg4 = config.services.dhcpd4;
|
cfg4 = config.services.dhcpd4;
|
||||||
cfg6 = config.services.dhcpd6;
|
cfg6 = config.services.dhcpd6;
|
||||||
|
|
||||||
writeConfig = cfg: pkgs.writeText "dhcpd.conf"
|
writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf"
|
||||||
''
|
''
|
||||||
default-lease-time 600;
|
default-lease-time 600;
|
||||||
max-lease-time 7200;
|
max-lease-time 7200;
|
||||||
|
@ -21,7 +21,9 @@ let
|
||||||
(machine: ''
|
(machine: ''
|
||||||
host ${machine.hostName} {
|
host ${machine.hostName} {
|
||||||
hardware ethernet ${machine.ethernetAddress};
|
hardware ethernet ${machine.ethernetAddress};
|
||||||
fixed-address ${machine.ipAddress};
|
fixed-address${
|
||||||
|
optionalString (postfix == "6") postfix
|
||||||
|
} ${machine.ipAddress};
|
||||||
}
|
}
|
||||||
'')
|
'')
|
||||||
cfg.machines
|
cfg.machines
|
||||||
|
@ -33,7 +35,7 @@ let
|
||||||
configFile =
|
configFile =
|
||||||
if cfg.configFile != null
|
if cfg.configFile != null
|
||||||
then cfg.configFile
|
then cfg.configFile
|
||||||
else writeConfig cfg;
|
else writeConfig postfix cfg;
|
||||||
leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
|
leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";
|
||||||
args = [
|
args = [
|
||||||
"@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
|
"@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"
|
||||||
|
|
Loading…
Reference in a new issue