From 8e6ad840f2b1851bcfc630fe6c73540ea73b5889 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Aug 2009 13:05:45 +0000 Subject: [PATCH] * Modularised the xinetd service. tftp has been factored out into a separate module, which just declares a configuration value that causes the xinetd module to add it to xinetd.conf. Also Nixified the service declarations to abstract over the inetd implementation. * Renamed the services.xinetd.tftpd options to services.tftpd. The fact that the tftpd module uses xinetd is an implementation detail. * xinetd: use -dontfork to let Upstart monitor it, and use -syslog to get error messages at startup. svn path=/nixos/trunk/; revision=16803 --- modules/module-list.nix | 3 +- modules/services/networking/tftpd.nix | 43 ++++ modules/services/networking/xinetd.nix | 212 +++++++++++------- .../x11/xserver/desktop-managers/kde4.nix | 2 +- 4 files changed, 172 insertions(+), 88 deletions(-) create mode 100644 modules/services/networking/tftpd.nix diff --git a/modules/module-list.nix b/modules/module-list.nix index af19ece8f1d..ec30539df84 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -68,9 +68,10 @@ ./services/networking/portmap.nix ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix + ./services/networking/tftpd.nix ./services/networking/vsftpd.nix - ./services/networking/xinetd.nix ./services/networking/wpa_supplicant.nix + ./services/networking/xinetd.nix ./services/printing/cupsd.nix ./services/scheduling/atd.nix ./services/scheduling/cron.nix diff --git a/modules/services/networking/tftpd.nix b/modules/services/networking/tftpd.nix new file mode 100644 index 00000000000..002fc991555 --- /dev/null +++ b/modules/services/networking/tftpd.nix @@ -0,0 +1,43 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +{ + + ###### interface + + options = { + + services.tftpd.enable = mkOption { + default = false; + description = '' + Whether to enable the anonymous FTP user. + ''; + }; + + services.tftpd.path = mkOption { + default = "/home/tftp"; + description = '' + Where the tftp server files are stored + ''; + }; + + }; + + + ###### implementation + + config = mkIf config.services.tftpd.enable { + + services.xinetd.enable = true; + + services.xinetd.services = singleton + { name = "tftp"; + protocol = "udp"; + server = "${pkgs.netkittftp}/sbin/in.tftpd"; + serverArgs = "${config.services.tftpd.path}"; + }; + + }; + +} diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix index a1a69a71955..a7f808e674e 100644 --- a/modules/services/networking/xinetd.nix +++ b/modules/services/networking/xinetd.nix @@ -1,95 +1,135 @@ -{pkgs, config, ...}: +{ config, pkgs, ... }: -###### interface -let - inherit (pkgs.lib) mkOption mkIf; - - options = { - services = { - xinetd = { - enable = mkOption { - default = false; - description = " - Whether to enable the vsftpd FTP server. - "; - }; - - tftpd = { - enable = mkOption { - default = false; - description = " - Whether to enable the anonymous FTP user. - "; - }; - - path = mkOption { - default = "/home/tftp"; - description = " - Where the tftp server files are stored - "; - }; - }; - }; - }; - }; -in - -###### implementation +with pkgs.lib; let - inherit (config.services.xinetd) tftpd; + cfg = config.services.xinetd; + inherit (pkgs) xinetd; - tftpservice = '' - service tftp - { - protocol = udp - port = 69 - socket_type = dgram - wait = yes - user = nobody - server = ${pkgs.netkittftp}/sbin/in.tftpd - server_args = ${tftpd.path} - disable = no - } - ''; - - configFile = pkgs.writeText "xinetd.conf" '' - defaults - { - log_type = SYSLOG daemon info - log_on_failure = HOST - log_on_success = PID HOST DURATION EXIT - } - ${if tftpd.enable then tftpservice else ""} - ''; - -in - -mkIf config.services.xinetd.enable { - require = [ - options - ]; - - services = { - extraJobs = [{ - name = "xinetd"; - - job = '' - description "xinetd server" - - start on network-interfaces/started - stop on network-interfaces/stop - - start script - - mkdir -p ${tftpd.path} - end script - - respawn ${xinetd}/sbin/xinetd -stayalive -f ${configFile} - ''; + configFile = pkgs.writeText "xinetd.conf" + '' + defaults + { + log_type = SYSLOG daemon info + log_on_failure = HOST + log_on_success = PID HOST DURATION EXIT + } - }]; + ${concatMapStrings makeService cfg.services} + ''; + + makeService = srv: + '' + service ${srv.name} + { + protocol = ${srv.protocol} + ${optionalString srv.unlisted "type = UNLISTED"} + socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"} + ${if srv.port != 0 then "port = ${toString srv.port}" else ""} + wait = ${if srv.protocol == "udp" then "yes" else "no"} + user = ${srv.user} + server = ${srv.server} + ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"} + } + ''; + +in + +{ + + ###### interface + + options = { + + services.xinetd.enable = mkOption { + default = false; + description = '' + Whether to enable the xinetd super-server daemon. + ''; + }; + + services.xinetd.services = mkOption { + default = []; + description = '' + A list of services provided by xinetd. + ''; + + type = types.list types.optionSet; + + options = { + + name = mkOption { + type = types.string; + example = "login"; + description = "Name of the service."; + }; + + protocol = mkOption { + type = types.string; + default = "tcp"; + description = + "Protocol of the service. Usually tcp or udp."; + }; + + port = mkOption { + type = types.int; + default = 0; + example = 123; + description = "Port number of the service."; + }; + + user = mkOption { + type = types.string; + default = "nobody"; + description = "User account for the service"; + }; + + server = mkOption { + type = types.string; + example = "/foo/bin/ftpd"; + description = "Path of the program that implements the service."; + }; + + serverArgs = mkOption { + type = types.string; + default = ""; + description = "Command-line arguments for the server program."; + }; + + unlisted = mkOption { + type = types.bool; + default = false; + description = '' + Whether this server is listed in + /etc/services. If so, the port + number can be omitted. + ''; + }; + + }; + + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + jobs = singleton + { name = "xinetd"; + + description = "xinetd server"; + + startOn = "network-interfaces/started"; + stopOn = "network-interfaces/stop"; + + exec = "${xinetd}/sbin/xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; + }; + + }; + } diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix index de0838565fc..9ce593f1444 100644 --- a/modules/services/x11/xserver/desktop-managers/kde4.nix +++ b/modules/services/x11/xserver/desktop-managers/kde4.nix @@ -28,7 +28,7 @@ in config = mkIf (xcfg.enable && cfg.enable) { - # If KDE 4 is enabled, make it default desktop manager (unless + # If KDE 4 is enabled, make it the default desktop manager (unless # overriden by the user's configuration). # !!! doesn't work yet ("Multiple definitions. Only one is allowed # for this option.")