From da542dc1aead733bdab82a08f73a7f3e5bde6c8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Nov 2011 23:06:24 +0000
Subject: [PATCH] * Added a module for oidentd.

svn path=/nixos/trunk/; revision=30381
---
 modules/module-list.nix                 | 13 ++++----
 modules/services/networking/oidentd.nix | 41 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 modules/services/networking/oidentd.nix

diff --git a/modules/module-list.nix b/modules/module-list.nix
index 44491dd116d..96127dee79a 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -65,10 +65,10 @@
   ./services/hardware/acpid.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/hal.nix
-  ./services/hardware/udisks.nix
-  ./services/hardware/upower.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/udev.nix
+  ./services/hardware/udisks.nix
+  ./services/hardware/upower.nix
   ./services/logging/klogd.nix
   ./services/logging/logrotate.nix
   ./services/logging/syslogd.nix
@@ -91,9 +91,9 @@
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/nagios/default.nix
-  ./services/monitoring/ups.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/systemhealth.nix
+  ./services/monitoring/ups.nix
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/drbd.nix
@@ -104,6 +104,7 @@
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
   ./services/networking/bitlbee.nix
+  ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
   ./services/networking/dhclient.nix
   ./services/networking/dhcpd.nix
@@ -119,6 +120,7 @@
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/nat.nix
   ./services/networking/ntpd.nix
+  ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
   ./services/networking/openvpn.nix
   ./services/networking/portmap.nix
@@ -128,11 +130,10 @@
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
   ./services/networking/sabnzbd.nix
-  ./services/networking/unbound.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
-  ./services/networking/cntlm.nix
   ./services/networking/tftpd.nix
+  ./services/networking/unbound.nix
   ./services/networking/vsftpd.nix
   ./services/networking/wakeonlan.nix
   ./services/networking/wicd.nix
@@ -158,8 +159,8 @@
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/slim.nix
-  ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/multitouch.nix
+  ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
   ./services/x11/window-managers/awesome.nix
   ./services/x11/window-managers/compiz.nix
diff --git a/modules/services/networking/oidentd.nix b/modules/services/networking/oidentd.nix
new file mode 100644
index 00000000000..d730e99af89
--- /dev/null
+++ b/modules/services/networking/oidentd.nix
@@ -0,0 +1,41 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.oidentd.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable ‘oidentd’, an implementation of the Ident
+        protocol (RFC 1413).  It allows remote systems to identify the
+        name of the user associated with a TCP connection.
+      '';
+    };
+
+  };
+
+  
+  ###### implementation
+
+  config = mkIf config.services.oidentd.enable {
+
+    jobs.oidentd =
+      { startOn = "started network-interfaces";
+        daemonType = "fork";
+        exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
+      };
+
+    users.extraUsers = singleton
+      { name = "oidentd";
+        description = "Ident Protocol daemon user";
+      };
+
+  };
+
+}