Remove unused xinetd based tftpd

1 files changed, 94 insertions, 107 deletions

diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index bf5cb57..3eed193 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -14,115 +14,102 @@
     ];
   };
 
-  services = {
-    kea.dhcp4 = {
-      enable = true;
-      settings = {
-        interfaces-config.interfaces = [ "enp116s0" ];
-
-        lease-database = {
-          name = "/var/lib/kea/dhcp4.leases";
-          persist = true;
-          type = "memfile";
-        };
-
-        renew-timer = 900;
-        rebind-timer = 1800;
-        valid-lifetime = 3600;
-
-        option-data = [
-          {
-            name = "domain-name-servers";
-            data = "192.168.1.1";
-            always-send = true;
-          }
-
-          {
-            name = "domain-name";
-            data = "bitgnome.net";
-            always-send = true;
-            }
-
-          {
-            name = "ntp-servers";
-            data = "192.168.1.1";
-            always-send = true;
-          }
-        ];
-
-        client-classes = [
-          {
-            name = "XClient_iPXE";
-            test = "substring(option[77].hex,0,4) == 'iPXE'";
-            boot-file-name = "http://arrakis.bitgnome.net/boot/netboot.ipxe";
-          }
-
-          {
-            name = "UEFI-64-1";
-            test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00007'";
-            next-server = "192.168.1.1";
-            boot-file-name = "/etc/tftp/ipxe.efi";
-          }
-
-          {
-            name = "UEFI-64-2";
-            test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00008'";
-            next-server = "192.168.1.1";
-            boot-file-name = "/etc/tftp/ipxe.efi";
-          }
-
-          {
-            name = "UEFI-64-3";
-            test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00009'";
-            next-server = "192.168.1.1";
-            boot-file-name = "/etc/tftp/ipxe.efi";
-          }
-
-          {
-            name = "Legacy";
-            test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00000'";
-            next-server = "192.168.1.1";
-            boot-file-name = "/etc/tftp/undionly.kpxe";
-          }
-        ];
-
-        subnet4 = [
-          {
-            id = 1;
-            subnet = "192.168.1.0/24";
-            pools = [ { pool = "192.168.1.100 - 192.168.1.199"; } ];
-
-            option-data = [
-              {
-                name = "routers";
-                data = "192.168.1.1";
-              }
-            ];
-
-            reservations = [
-              ({ hw-address = "8c:8c:aa:4e:e9:8c"; ip-address = "192.168.1.11"; }) # jupiter
-              ({ hw-address = "38:f3:ab:59:06:e0"; ip-address = "192.168.1.12"; }) # saturn
-              ({ hw-address = "8c:8c:aa:4e:fc:aa"; ip-address = "192.168.1.13"; }) # uranus
-              ({ hw-address = "38:f3:ab:59:08:10"; ip-address = "192.168.1.14"; }) # neptune
-              ({ hw-address = "7c:b5:66:65:e2:9e"; ip-address = "192.168.1.17"; }) # ginaz
-              ({ hw-address = "00:05:cd:72:92:b0"; ip-address = "192.168.1.19"; }) # onkyo
-              ({ hw-address = "74:29:af:6f:20:ed"; ip-address = "192.168.1.20"; }) # brother
-              ({ hw-address = "ec:08:6b:6a:4a:ac"; ip-address = "192.168.1.252"; }) # ac2600
-            ];
-          }
-        ];
+  services.kea.dhcp4 = {
+    enable = true;
+    settings = {
+      interfaces-config.interfaces = [ "enp116s0" ];
+
+      lease-database = {
+        name = "/var/lib/kea/dhcp4.leases";
+        persist = true;
+        type = "memfile";
       };
-    };
 
-    xinetd = {
-      enable = true;
-      services = [{
-        name = "tftp";
-        protocol = "udp";
-        server = "${pkgs.tftp-hpa}/sbin/in.tftpd";
-        serverArgs = "/etc/tftp";
-        user = "root";
-      }];
+      renew-timer = 900;
+      rebind-timer = 1800;
+      valid-lifetime = 3600;
+
+      option-data = [
+        {
+          name = "domain-name-servers";
+          data = "192.168.1.1";
+          always-send = true;
+        }
+
+        {
+          name = "domain-name";
+          data = "bitgnome.net";
+          always-send = true;
+        }
+
+        {
+          name = "ntp-servers";
+          data = "192.168.1.1";
+          always-send = true;
+        }
+      ];
+
+      client-classes = [
+        {
+          name = "XClient_iPXE";
+          test = "substring(option[77].hex,0,4) == 'iPXE'";
+          boot-file-name = "http://arrakis.bitgnome.net/boot/netboot.ipxe";
+        }
+
+        {
+          name = "UEFI-64-1";
+          test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00007'";
+          next-server = "192.168.1.1";
+          boot-file-name = "/etc/tftp/ipxe.efi";
+        }
+
+        {
+          name = "UEFI-64-2";
+          test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00008'";
+          next-server = "192.168.1.1";
+          boot-file-name = "/etc/tftp/ipxe.efi";
+        }
+
+        {
+          name = "UEFI-64-3";
+          test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00009'";
+          next-server = "192.168.1.1";
+          boot-file-name = "/etc/tftp/ipxe.efi";
+        }
+
+        {
+          name = "Legacy";
+          test = "substring(option[60].hex,0,20) == 'PXEClient:Arch:00000'";
+          next-server = "192.168.1.1";
+          boot-file-name = "/etc/tftp/undionly.kpxe";
+        }
+      ];
+
+      subnet4 = [
+        {
+          id = 1;
+          subnet = "192.168.1.0/24";
+          pools = [ { pool = "192.168.1.100 - 192.168.1.199"; } ];
+
+          option-data = [
+            {
+              name = "routers";
+              data = "192.168.1.1";
+            }
+          ];
+
+          reservations = [
+            ({ hw-address = "8c:8c:aa:4e:e9:8c"; ip-address = "192.168.1.11"; }) # jupiter
+            ({ hw-address = "38:f3:ab:59:06:e0"; ip-address = "192.168.1.12"; }) # saturn
+            ({ hw-address = "8c:8c:aa:4e:fc:aa"; ip-address = "192.168.1.13"; }) # uranus
+            ({ hw-address = "38:f3:ab:59:08:10"; ip-address = "192.168.1.14"; }) # neptune
+            ({ hw-address = "7c:b5:66:65:e2:9e"; ip-address = "192.168.1.17"; }) # ginaz
+            ({ hw-address = "00:05:cd:72:92:b0"; ip-address = "192.168.1.19"; }) # onkyo
+            ({ hw-address = "74:29:af:6f:20:ed"; ip-address = "192.168.1.20"; }) # brother
+            ({ hw-address = "ec:08:6b:6a:4a:ac"; ip-address = "192.168.1.252"; }) # ac2600
+          ];
+        }
+      ];
     };
   };