diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2026-03-27 15:51:23 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2026-03-27 15:51:23 -0500 |
| commit | 18916f2edd08e74ef8401b30e6cae291319bfc8c (patch) | |
| tree | a7ae52f4472a36ff806dc3343dcb23d50886d710 | |
| parent | 4c66a7e794e411511473081f5c16aa6c0e6f7000 (diff) | |
| download | nixos-18916f2edd08e74ef8401b30e6cae291319bfc8c.tar.xz nixos-18916f2edd08e74ef8401b30e6cae291319bfc8c.zip | |
fix dns-dhcp module issues
| -rw-r--r-- | nixos/services/router/dns-dhcp.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/services/router/dns-dhcp.nix b/nixos/services/router/dns-dhcp.nix index ea8f32e..48e0b8e 100644 --- a/nixos/services/router/dns-dhcp.nix +++ b/nixos/services/router/dns-dhcp.nix @@ -165,7 +165,7 @@ in { mkDHCPRange = ipRangeStart: ipRangeEnd: subnetMask: leaseTime: "${ipRangeStart},${ipRangeEnd},${subnetMask},${leaseTime}"; mkDHCPOption = option: value: "option:${option},${value}"; mkDHCPStaticLease = macAddress: hostname: staticIp: "${macAddress},${hostname},${staticIp},infinite"; - dhcpStaticLeases = builtins.map (l: mkDHCPStaticLease l.macAddress l.hostname l.staticIp) cfg.staticLeases; + dhcpStaticLeases = lib.mapAttrsToList (_: l: mkDHCPStaticLease l.macAddress l.hostname l.staticIp) cfg.dhcp.staticLeases; in { # General no-resolv = true; # Do not read /etc/resolv.conf, resolve only the LAN @@ -181,7 +181,7 @@ in { # DHCP Server # TODO config #dhcp-range = mkDHCPRange "192.168.1.50" "192.168.1.150" "255.255.255.0" "12h"; # Enable DHCP on the LAN interface - dhcp-range = with cfg.dhcp; mkDHCPRange rangeStart rangeEnd subnetMask leaseTime; # Enable DHCP on the LAN interface + dhcp-range = with cfg.dhcp; mkDHCPRange rangeStart rangeEnd rangeSubnetMask leaseTime; # Enable DHCP on the LAN interface dhcp-host = dhcpStaticLeases; # Setup static leases @@ -189,7 +189,7 @@ in { (mkDHCPOption "router" defaultGateway) # Set default gateway for clients #(mkDHCPOption "ntp-server" defaultGateway) # Set ntp server for clients (mkDHCPOption "dns-server" localhostIp) # Set dns server for clients - (mkDHCPOption "domain-search" localDomain) # Add search rule to clients so they can resolve hostnames w/o the local domain suffix + (mkDHCPOption "domain-search" cfg.localDomain) # Add search rule to clients so they can resolve hostnames w/o the local domain suffix ]; # Logging |