Convert `portmap' Upstart job to the "new" style.

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

system/options.nix

@@ -967,18 +967,6 @@ in
 
     };
 
-    portmap = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable `portmap', an ONC RPC directory service
-          notably used by NFS and NIS, and which can be queried
-          using the rpcinfo(1) command.
-        '';
-      };
-    };
-
     avahi = {
 
       enable = mkOption {
@@ -3081,5 +3069,6 @@ root        ALL=(ALL) SETENV: ALL
     (import ../upstart-jobs/rogue.nix)
     (import ../upstart-jobs/guest-users.nix)
     (import ../upstart-jobs/pulseaudio.nix)
+    (import ../upstart-jobs/portmap.nix)
   ];
 }

upstart-jobs/default.nix

@@ -220,12 +220,6 @@ let
       servers = config.services.ntp.servers;
     })
 
-  # portmap daemon.
-  ++ optional config.services.portmap.enable
-    (import ../upstart-jobs/portmap.nix {
-      inherit (pkgs) makePortmap;
-     })
-
   # Avahi daemon.
   ++ optional config.services.avahi.enable
     (import ../upstart-jobs/avahi-daemon.nix {

upstart-jobs/portmap.nix

@@ -1,12 +1,40 @@
-{ makePortmap }:
+{pkgs, config, ...}:
 
-let uid = (import ../system/ids.nix).uids.portmap;
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  inherit (pkgs) makePortmap;
+
+  uid = (import ../system/ids.nix).uids.portmap;
   gid = (import ../system/ids.nix).gids.portmap;
-in
-{
-  name = "portmap";
 
-  users = [
+  options = {
+    services = {
+      portmap = {
+
+        enable = mkOption {
+          default = false;
+          description = ''
+            Whether to enable `portmap', an ONC RPC directory service
+            notably used by NFS and NIS, and which can be queried
+            using the rpcinfo(1) command.
+          '';
+        };
+
+      };
+    };
+  };
+
+in
+
+###### implementation
+mkIf config.services.portmap.enable {
+  require = [
+    options
+  ];
+  
+  users = {
+    extraUsers = [
       { name = "portmap";
         inherit uid;
         description = "portmap daemon user";
@@ -14,16 +42,20 @@ in
       }
     ];
 
-  groups = [
+    extraGroups = [
       { name = "portmap";
         inherit gid;
       }
     ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "portmap";
 
       job =
         let portmap = makePortmap { daemonUID = uid; daemonGID = gid; };
-    in
+        in ''
-       ''
           description "ONC RPC portmap"
 
           start on network-interfaces/started
@@ -31,5 +63,6 @@ stop on network-interfaces/stop
 
           respawn ${portmap}/sbin/portmap
         '';
-  
+    }];
+  };
 }