From d0f43d62fe085888c811492fc81f92e314bc1a0e Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Sun, 29 Dec 2024 12:44:05 -0800 Subject: Disable tftp-hpa entirely for now --- hosts/common/core/default.nix | 2 +- hosts/common/optional/services/dhcp.nix | 36 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix index 10c286d..33105ab 100644 --- a/hosts/common/core/default.nix +++ b/hosts/common/core/default.nix @@ -82,7 +82,7 @@ strace sysstat tcpdump - master.tftp-hpa + #tftp-hpa traceroute tree tshark diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix index 3eed193..2547bf9 100644 --- a/hosts/common/optional/services/dhcp.nix +++ b/hosts/common/optional/services/dhcp.nix @@ -3,13 +3,13 @@ environment = { etc = { - "tftp/ipxe.efi".source = "${pkgs.ipxe}/ipxe.efi"; - "tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe"; + #"tftp/ipxe.efi".source = "${pkgs.ipxe}/ipxe.efi"; + #"tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe"; }; systemPackages = with pkgs; [ ipxe - tftp-hpa + #tftp-hpa wol ]; }; @@ -114,20 +114,20 @@ }; systemd.services = { - tftpd = { - after = [ "nftables.service" ]; - description = "TFTP server"; - serviceConfig = { - User = "root"; - Group = "root"; - Restart = "always"; - RestartSec = 5; - Type = "exec"; - ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp"; - TimeoutStopSec = 20; - PIDFile = "/run/tftpd.pid"; - }; - wantedBy = [ "multi-user.target" ]; - }; + #tftpd = { + # after = [ "nftables.service" ]; + # description = "TFTP server"; + # serviceConfig = { + # User = "root"; + # Group = "root"; + # Restart = "always"; + # RestartSec = 5; + # Type = "exec"; + # ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp"; + # TimeoutStopSec = 20; + # PIDFile = "/run/tftpd.pid"; + # }; + # wantedBy = [ "multi-user.target" ]; + #}; }; } -- cgit v1.2.3