From a6416c92b24f86a0c317e4d8d392011029246094 Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Mon, 21 Sep 2026 13:15:38 -0500 Subject: update dns-dhcp module to explicitly distinguish between local domain (dnsmasq) overrides and proper dns overrides with unbound. fixed dns overrides and imported them for poweredge and poweredge-pro. cleaned up router-hosts.nix on poweredge --- hosts/poweredge/router-hosts.nix | 88 ++++++++++++---------------------------- 1 file changed, 25 insertions(+), 63 deletions(-) (limited to 'hosts/poweredge') diff --git a/hosts/poweredge/router-hosts.nix b/hosts/poweredge/router-hosts.nix index 2a08558..b53b2a1 100644 --- a/hosts/poweredge/router-hosts.nix +++ b/hosts/poweredge/router-hosts.nix @@ -9,76 +9,38 @@ let }; staticLeases = { # Network - idrac-7N94GK2 = { - macAddress = "50:9a:4c:5d:c3:7c"; - staticIp = "192.168.1.2"; - }; - OpenWrt-Attic = { - macAddress = "34:98:b5:60:5e:be"; - staticIp = "192.168.1.3"; - }; - OpenWrt-Basement = { - macAddress = "8c:3b:ad:35:c7:8c"; - staticIp = "192.168.1.4"; - }; - ArcherC54 = { - macAddress = "12:eb:b6:13:f9:e2"; - staticIp = "192.168.1.5"; - }; + idrac-7N94GK2 = { macAddress = "50:9a:4c:5d:c3:7c"; staticIp = "192.168.1.2"; }; + OpenWrt-Attic = { macAddress = "34:98:b5:60:5e:be"; staticIp = "192.168.1.3"; }; + OpenWrt-Basement = { macAddress = "8c:3b:ad:35:c7:8c"; staticIp = "192.168.1.4"; }; + ArcherC54 = { macAddress = "14:eb:b6:13:f9:e0"; staticIp = "192.168.1.5"; }; # Desktops - T495 = { - macAddress = "04:33:c2:9d:34:74"; - staticIp = "192.168.1.11"; - }; - optiplex = { - macAddress = "e4:54:e8:bc:ba:05"; - staticIp = "192.168.1.12"; - }; - X230 = { - macAddress = "84:3a:4b:60:34:c4"; - staticIp = "192.168.1.13"; - }; + T495 = { macAddress = "04:33:c2:9d:34:74"; staticIp = "192.168.1.11"; }; + optiplex = { macAddress = "e4:54:e8:bc:ba:05"; staticIp = "192.168.1.12"; }; + X230 = { macAddress = "84:3a:4b:60:34:c4"; staticIp = "192.168.1.13"; }; + # Appliances + # TODO add epson printer + p1s = { macAddress = "3c:0f:02:d5:23:64"; staticIp = "192.168.1.39"; }; + gnuslashprinter = { macAddress = "00:23:24:5b:f0:6d"; staticIp = "192.168.1.40"; }; # Services - gnuslashprinter = { - macAddress = "00:23:24:5b:f0:6d"; - staticIp = "192.168.1.40"; - }; - immich = { - macAddress = "02:00:00:00:00:01"; - staticIp = "192.168.1.41"; - }; - jellyfin = { - macAddress = "02:00:00:00:00:02"; - staticIp = "192.168.1.42"; - }; - gitea = { - macAddress = "02:00:00:00:00:03"; - staticIp = "192.168.1.43"; - }; - bitcoind = { - macAddress = "02:00:00:00:00:04"; - staticIp = "192.168.1.44"; - }; - filebrowser = { - macAddress = "02:00:00:00:00:05"; - staticIp = "192.168.1.45"; - }; - grafana = { - macAddress = "02:00:00:00:00:06"; - staticIp = "192.168.1.46"; - }; - transmission = { - macAddress = "02:00:00:00:00:07"; - staticIp = "192.168.1.47"; - }; + immich = { macAddress = "02:00:00:00:00:01"; staticIp = "192.168.1.41"; }; + jellyfin = { macAddress = "02:00:00:00:00:02"; staticIp = "192.168.1.42"; }; + gitea = { macAddress = "02:00:00:00:00:03"; staticIp = "192.168.1.43"; }; + bitcoind = { macAddress = "02:00:00:00:00:04"; staticIp = "192.168.1.44"; }; + filebrowser = { macAddress = "02:00:00:00:00:05"; staticIp = "192.168.1.45"; }; + grafana = { macAddress = "02:00:00:00:00:06"; staticIp = "192.168.1.46"; }; + transmission = { macAddress = "02:00:00:00:00:07"; staticIp = "192.168.1.47"; }; }; - dns.hostOverrides = { - "router.${localDomain}" = "192.168.1.1"; + localDomainOverrides = { + "router.${localDomain}" = "192.168.1.1"; # FIXME ping router on separate host returns 127.0.0.2 "poweredge.${localDomain}" = "192.168.1.10"; }; in { + imports = [ ../poweredge-pro/dns-overrides.nix ]; services._router.dnsDhcpConfig = { - inherit localDomain dhcp dns; + inherit dhcp; + localResolution = { + inherit localDomain localDomainOverrides; + }; }; networking.hosts."192.168.1.1" = [ "router.${localDomain}" "router" ]; } -- cgit v1.2.3