Add `atd' Upstart job.

svn path=/nixos/trunk/; revision=11435

etc/default.nix

@@ -233,6 +233,7 @@ import ../helpers/make-etc.nix {
       }
     )
     [
+      "atd"
       "login"
       "slim"
       "su"

etc/pam.d/atd

@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common

system/ids.nix

@@ -13,6 +13,7 @@
     bitlbee = 9;
     avahi = 10;
     portmap = 11;
+    atd = 12;
 
     nixbld = 30000; # start of range of uids
     nobody = 65534;
@@ -27,6 +28,8 @@
     bitlbee = 9;
     avahi = 10;
     portmap = 11;
+    atd = 12;
+
     audio = 17;
 
     users = 100;

system/options.nix

@@ -611,6 +611,15 @@
 
     };
 
+    atd = {
+
+      enable = mkOption {
+        default = true;
+	description = ''
+	  Whether to enable the `at' daemon, a command scheduler.
+	'';
+      };
+    };
 
     locate = {
 

system/system.nix

@@ -257,6 +257,7 @@ rec {
     pkgs.wirelesstools
   ]
   ++ pkgs.lib.optional config.security.sudo.enable pkgs.sudo
+  ++ pkgs.lib.optional config.services.atd.enable pkgs.at
   ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
@@ -304,7 +305,8 @@ rec {
     setuidPrograms =
       config.security.setuidPrograms ++
       config.security.extraSetuidPrograms ++
-      pkgs.lib.optional (config.security.sudo.enable) "sudo";
+      pkgs.lib.optional (config.security.sudo.enable) "sudo" ++
+      (if (config.services.atd.enable) then [ "at" "atq" "atrm" ] else []);
 
     inherit (usersGroups) createUsersGroups usersList groupsList;
 

upstart-jobs/atd.nix

@@ -0,0 +1,64 @@
+{ at }:
+
+let uid = (import ../system/ids.nix).uids.atd;
+    gid = (import ../system/ids.nix).gids.atd;
+in
+{
+  name = "atd";
+  
+  users = [
+    { name = "atd";
+      inherit uid;
+      description = "atd user";
+      home = "/var/empty";
+    }
+  ];
+
+  groups = [
+    { name = "atd";
+      inherit gid;
+    }
+  ];
+
+  job = ''
+description "at daemon (atd)"
+
+start on startup
+stop on shutdown
+
+start script
+   # Snippets taken and adapted from the original `install' rule of
+   # the makefile.
+
+   # We assume these values are those actually used in Nixpkgs for
+   # `at'.
+   spooldir=/var/spool/atspool
+   jobdir=/var/spool/atjobs
+   etcdir=/etc/at
+
+   for dir in "$spooldir" "$jobdir" "$etcdir"
+   do
+     if [ ! -d "$dir" ]
+     then
+         mkdir "$dir" && chown atd:atd "$dir"
+     fi
+   done
+   chmod 1770 "$spooldir" "$jobdir"
+   if [ ! -f "$etcdir"/at.deny ]
+   then
+       touch "$etcdir"/at.deny && \
+       chown root:root "$etcdir"/at.deny && \
+       chmod 640 "$etcdir"/at.deny
+   fi
+   if [ ! -f "$jobdir"/.SEQ ]
+   then
+       touch "$jobdir"/.SEQ && \
+       chown atd:atd "$jobdir"/.SEQ && \
+       chmod 600 "$jobdir"/.SEQ
+   fi
+end script
+
+respawn ${at}/sbin/atd
+'';
+  
+}

upstart-jobs/default.nix

@@ -167,6 +167,12 @@ let
 
   ])
 
+  # At daemon.
+  ++ optional config.services.atd.enable
+    (import ../upstart-jobs/atd.nix {
+      at = pkgs.at;
+     })
+
   # DHCP client.
   ++ optional config.networking.useDHCP
     (import ../upstart-jobs/dhclient.nix {