* jobAttrs -> jobs.

svn path=/nixos/trunk/; revision=17769
15 years ago · eba8f94069
parent 40c9057a49
commit eba8f94069
71 changed files with 78 additions and 79 deletions
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@ -45,7 +45,7 @@ in
        gid = config.ids.gids.audio;
      };

-    jobAttrs.alsa =
+    jobs.alsa =
      { startOn = "udev";

        preStart =
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@ -62,7 +62,7 @@ in
        inherit gid;
      };

-    jobAttrs.pulseaudio =
+    jobs.pulseaudio =
      { description = "PulseAudio system-wide server";

        startOn = "startup";
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@ -72,7 +72,7 @@ in

    environment.systemPackages = [mysql];

-    jobAttrs.mysql =
+    jobs.mysql =
      { description = "MySQL server";

        startOn = "filesystems";
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@ -113,7 +113,7 @@ in

    environment.systemPackages = [postgresql];

-    jobAttrs.postgresql =
+    jobs.postgresql =
      { description = "PostgreSQL server";

        startOn = "${startDependency}/started";
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@ -76,7 +76,7 @@ in

  config = mkIf config.powerManagement.enable {

-    jobAttrs.acpid =
+    jobs.acpid =
      { description = "ACPI daemon";

        startOn = "udev";
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@ -64,7 +64,7 @@ in
        gid = config.ids.gids.haldaemon;
      };

-    jobAttrs.hal =
+    jobs.hal =
      { description = "HAL daemon";
        
        # !!! TODO: make sure that HAL starts after acpid,
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@ -152,7 +152,7 @@ in
    
    services.udev.packages = [extraUdevRules];

-    jobAttrs.udev =
+    jobs.udev =
      { startOn = "startup";
        stopOn = "shutdown";

--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@ -10,7 +10,7 @@ in

 {

-  jobAttrs.klogd =
+  jobs.klogd =
    { description = "Kernel log daemon";

      startOn = "syslogd";
--- a/modules/services/logging/syslogd.nix
+++ b/modules/services/logging/syslogd.nix
@ -47,7 +47,7 @@ in

  config = {
  
-    jobAttrs.syslogd =
+    jobs.syslogd =
      { description = "Syslog daemon";

        startOn = "udev";
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@ -113,7 +113,7 @@ in
        gid = config.ids.gids.dovecot;
      };

-    jobAttrs.dovecot =
+    jobs.dovecot =
      { description = "Dovecot IMAP/POP3 server";

        startOn = "${startingDependency}/started";
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@ -275,7 +275,7 @@ in
        }
      ];

-    jobAttrs.postfix =
+    jobs.postfix =
      # I copy _lots_ of shipped configuration filed 
      # that can be left as is. I am afraid the exact
      # will list slightly change in next Postfix 
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@ -72,7 +72,7 @@ in
        source = pkgs.writeText "auto.master" cfg.autoMaster;
      };

-    jobAttrs.autofs =
+    jobs.autofs =
      { description = "Filesystem automounter";

        startOn = "network-interfaces/started";
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@ -36,7 +36,7 @@ in
    services.dbus.enable = true;
    services.dbus.packages = [ pkgs.disnix ];

-    jobAttrs.disnix =
+    jobs.disnix =
      { description = "Disnix server";

        startOn = "dbus";
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@ -85,7 +85,7 @@ in
        inherit gid;
      };

-    jobAttrs.gpsd =
+    jobs.gpsd =
      { description = "GPSD daemon";

        startOn = "network-interfaces/started";
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@ -188,7 +188,7 @@ in
          target = "nix.machines";
        };

-    jobAttrs.nixDaemon =
+    jobs.nixDaemon =
      { startOn = "startup";

        script =
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@ -72,7 +72,7 @@ in

    boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];

-    jobAttrs = mkIf cfg.showManual
+    jobs = mkIf cfg.showManual
      { nixosManual = 
        { name = "nixos-manual";

--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@ -40,7 +40,7 @@ in

    boot.extraTTYs = [ cfg.tty ];
  
-    jobAttrs.rogue =
+    jobs.rogue =
      { description = "Rogue dungeon crawling game";

        startOn = "udev";
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@ -68,7 +68,7 @@ in

  config = {

-    jobAttrs =
+    jobs =
    
      optionalAttrs cfgC.enable
        { synergyClient = 
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@ -158,7 +158,7 @@ in

    environment.systemPackages = [ pkgs.nagios ];

-    jobAttrs.nagios =
+    jobs.nagios =
      { # Run `nagios -v' to check the validity of the configuration file so
        # that a nixos-rebuild fails *before* we kill the running Nagios
        # daemon.
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@ -64,7 +64,7 @@ in
        description = "Zabbix daemon user";
      };

-    jobAttrs.zabbix_agent =
+    jobs.zabbix_agent =
      { #name = "zabbix-agent"; !!! mkIf bug

        description = "Zabbix agent daemon";
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@ -51,7 +51,7 @@ in
        description = "Zabbix daemon user";
      };

-    jobAttrs.zabbix_server =
+    jobs.zabbix_server =
      { #name = "zabbix-server"; !!! mkIf bug

        description = "Zabbix server daemon";
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@ -76,7 +76,7 @@ in
        target = "exports";
      };

-    jobAttrs.nfs_kernel_exports =
+    jobs.nfs_kernel_exports =
      { name = "nfs-kernel-exports";
      
        description = "Kernel NFS server";
@ -106,7 +106,7 @@ in
          '';
      };

-    jobAttrs.nfs_kernel_nfsd =
+    jobs.nfs_kernel_nfsd =
      { name = "nfs-kernel-nfsd";

        description = "Kernel NFS server";
@ -117,7 +117,7 @@ in
        exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
      };

-    jobAttrs.nfs_kernel_mountd =
+    jobs.nfs_kernel_mountd =
      { name = "nfs-kernel-mountd";

        description = "Kernel NFS server - mount daemon";
@ -128,7 +128,7 @@ in
        exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
      };

-    jobAttrs.nfs_kernel_statd =
+    jobs.nfs_kernel_statd =
      { name = "nfs-kernel-statd";
      
        description = "Kernel NFS server - Network Status Monitor";
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@ -164,7 +164,7 @@ in
      });

    # Dummy job to start the real Samba daemons (nmbd, smbd, winbindd).
-    jobAttrs.sambaControl =
+    jobs.sambaControl =
      { name = "samba";
        description = "Samba server";

@ -176,11 +176,11 @@ in

    # nmbd says "standard input is not a socket, assuming -D option",
    # but using -i makes it stay in foreground (?)
-    jobAttrs.nmbd = daemonJob "nmbd" " -i -F";
+    jobs.nmbd = daemonJob "nmbd" " -i -F";

-    jobAttrs.smbd = daemonJob "smbd" " -i -F";
+    jobs.smbd = daemonJob "smbd" " -i -F";

-    jobAttrs.winbindd = daemonJob "winbindd" " -F";
+    jobs.winbindd = daemonJob "winbindd" " -F";

  };
  
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@ -115,7 +115,7 @@ in

    environment.systemPackages = [ avahi ];

-    jobAttrs.avahi_daemon =
+    jobs.avahi_daemon =
      { name = "avahi-daemon";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/bind.nix
+++ b/modules/services/networking/bind.nix
@ -105,7 +105,7 @@ in

  config = mkIf config.services.bind.enable {

-    jobAttrs.bind =
+    jobs.bind =
      { description = "BIND name server job";

        preStart =
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@ -64,7 +64,7 @@ in
        gid = config.ids.gids.bitlbee;
      };

-    jobAttrs.bitlbee =
+    jobs.bitlbee =
      { description = "BitlBee IRC to other chat networks gateway";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@ -110,7 +110,7 @@ in
        home = stateDir;
      };

-    jobAttrs.ddclient =
+    jobs.ddclient =
      { name = "ddclient";

        startOn = "startup";
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@ -61,7 +61,7 @@ in
  
  config = mkIf config.networking.useDHCP {

-    jobAttrs.dhclient = 
+    jobs.dhclient = 
      { startOn = "network-interfaces/started";
        stopOn = "network-interfaces/stop";

--- a/modules/services/networking/dhcpd.nix
+++ b/modules/services/networking/dhcpd.nix
@ -108,7 +108,7 @@ in

  config = mkIf config.services.dhcpd.enable {

-    jobAttrs.dhcpd =
+    jobs.dhcpd =
      { description = "DHCP server";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@ -50,7 +50,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs.ejabberd =
+    jobs.ejabberd =
      { description = "EJabberd server";

        startOn = "network-interface/started";
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@ -78,7 +78,7 @@ in

    environment.systemPackages = [pkgs.iptables];

-    jobAttrs.firewall =
+    jobs.firewall =
      { startOn = "network-interfaces/started";

        preStart =
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@ -191,7 +191,7 @@ in
        home = "/var/empty";
      };

-    jobAttrs.gnunetd =
+    jobs.gnunetd =
      { description = "The GNUnet Daemon";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@ -129,7 +129,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs.gw6c =
+    jobs.gw6c =
      { description = "Gateway6 client";
      
        startOn = if cfg.autorun then "network-interfaces/started" else "";
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@ -55,7 +55,7 @@ in

  config = mkIf config.networking.interfaceMonitor.enable {

-    jobAttrs.ifplugd =
+    jobs.ifplugd =
      { description = "Network interface connectivity monitor";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@ -117,7 +117,7 @@ in
    users.extraGroups = singleton
      { name = "ircd"; };

-    jobAttrs.ircd_hybrid =
+    jobs.ircd_hybrid =
      { # name = "ircd-hybrid"; !!! mkIf bug

        description = "IRCD Hybrid server";
--- a/modules/services/networking/ntpd.nix
+++ b/modules/services/networking/ntpd.nix
@ -70,7 +70,7 @@ in
        home = stateDir;
      };

-    jobAttrs.ntpd =
+    jobs.ntpd =
      { description = "NTP daemon";

        startOn = "ip-up";
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@ -49,7 +49,7 @@ in
        message = "openfire assertion failed";
      };

-    jobAttrs.openfire =
+    jobs.openfire =
      { description = "OpenFire XMPP server";

        startOn = "${startDependency}/started";
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@ -121,7 +121,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
+    jobs = listToAttrs (map (c: nameValuePair "openvpn-${cfg.id}" (makeOpenVPNJob c)) cfg.servers);
  
  };
  
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@ -63,7 +63,7 @@ in
        inherit gid;
      };

-    jobAttrs.portmap =
+    jobs.portmap =
      { description = "ONC RPC portmap";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@ -77,7 +77,7 @@ in
        home = stateDir;
      };

-    jobAttrs.privoxy =
+    jobs.privoxy =
      { name = "privoxy";

        startOn = "startup";
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@ -116,7 +116,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs.lshd =
+    jobs.lshd =
      { description = "GNU lshd SSH2 daemon";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/ssh/sshd.nix
+++ b/modules/services/networking/ssh/sshd.nix
@ -108,7 +108,7 @@ in
        home = "/var/empty";
      };

-    jobAttrs.sshd = {
+    jobs.sshd = {

        description = "OpenSSH server";

--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@ -99,7 +99,7 @@ in
        gid = config.ids.gids.ftp;
      };

-    jobAttrs.vsftpd =
+    jobs.vsftpd =
      { description = "vsftpd server";

        startOn = "network-interfaces/started";
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@ -37,7 +37,7 @@ in

    environment.systemPackages = [pkgs.wpa_supplicant];

-    jobAttrs.wpa_supplicant = 
+    jobs.wpa_supplicant = 
      { startOn = "network-interfaces/started";
        stopOn = "network-interfaces/stop";

--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@ -119,7 +119,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs.xinetd =
+    jobs.xinetd =
      { description = "xinetd server";

        startOn = "network-interfaces/started";
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@ -155,7 +155,7 @@ in
        }
      ];

-    jobAttrs.cupsd =
+    jobs.cupsd =
      { description = "CUPS printing daemon";

        startOn = "network-interfaces/started";
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@ -63,7 +63,7 @@ in
        gid = config.ids.gids.atd;
      };

-    jobAttrs.atd =
+    jobs.atd =
      { description = "at daemon (atd)";

        startOn = "startup";
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@ -66,7 +66,7 @@ in

    environment.systemPackages = [pkgs.cron];

-    jobAttrs.cron =
+    jobs.cron =
      { description = "Cron daemon";

        startOn = "startup";
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@ -97,7 +97,7 @@ in

    environment.systemPackages = [ pkgs.fcron ];

-    jobAttrs.fcron =
+    jobs.fcron =
      { description = "fcron daemon";

        startOn = "startup";
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@ -113,7 +113,7 @@ in
        gid = config.ids.gids.messagebus;
      };

-    jobAttrs.dbus =
+    jobs.dbus =
      { startOn = "udev";
        stopOn = "shutdown";

--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@ -17,7 +17,7 @@ in
        description = "Name service cache daemon user";
      };

-    jobAttrs.nscd =
+    jobs.nscd =
      { description = "Name Service Cache Daemon";

        startOn = "startup";
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@ -49,7 +49,7 @@ in
        home = stateDir;
      };

-    jobAttrs.uptimed =
+    jobs.uptimed =
      { description = "Uptimed daemon";

        startOn = "startup";
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@ -38,7 +38,7 @@ in

  config = mkIf cfg.enable {

-    jobAttrs.gpm =
+    jobs.gpm =
      { description = "General purpose mouse";

        startOn = "udev";
--- a/modules/services/ttys/mingetty.nix
+++ b/modules/services/ttys/mingetty.nix
@ -53,7 +53,7 @@ with pkgs.lib;
  config = {

    # Generate a separate job for each tty.  
-    jobAttrs = listToAttrs (map (tty: nameValuePair tty {
+    jobs = listToAttrs (map (tty: nameValuePair tty {
    
      startOn = "udev";

--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@ -559,7 +559,7 @@ in

    environment.systemPackages = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;

-    jobAttrs.httpd =
+    jobs.httpd =
      { # Statically verify the syntactic correctness of the generated
        # httpd.conf.  !!! this is impure!  It doesn't just check for
        # syntax, but also whether the Apache user/group exist,
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss.nix
@ -70,7 +70,7 @@ in

  config = mkIf config.services.jboss.enable {

-    jobAttrs.jboss =
+    jobs.jboss =
      { description = "JBoss server";

        exec = "${jbossService}/bin/control start";
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@ -101,7 +101,7 @@ in
        home = "/homeless-shelter";
      };
      
-    jobAttrs.tomcat =
+    jobs.tomcat =
      { description = "Apache Tomcat server";

        startOn = "network-interface/started";
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@ -40,7 +40,7 @@ in
        message = "Please enable fontDir (fonts.enableFontDir) to use xfs.";
      };

-    jobAttrs.xfs =
+    jobs.xfs =
      { description = "X Font Server";
      
        startOn = "${startingDependency}/started";
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@ -348,7 +348,7 @@ in
    
    services.hal.packages = halConfigFiles;

-    jobAttrs.xserver =
+    jobs.xserver =
      { startOn = if cfg.autorun then "hal" else "never";
 
        environment =
--- a/modules/system/upstart-events/ctrl-alt-delete.nix
+++ b/modules/system/upstart-events/ctrl-alt-delete.nix
@ -3,7 +3,7 @@
 ###### implementation

 {
-  jobAttrs.ctrl_alt_delete =
+  jobs.ctrl_alt_delete =
    { name = "ctrl-alt-delete";

      startOn = "ctrlaltdel";
--- a/modules/system/upstart-events/halt.nix
+++ b/modules/system/upstart-events/halt.nix
@ -116,6 +116,6 @@ let
 in

 {
-  jobAttrs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
+  jobs = listToAttrs (map (n: nameValuePair "sys-${n}" (jobFun n))
    [ "reboot" "halt" "system-halt" "power-off" ] );
 }
--- a/modules/system/upstart-events/maintenance-shell.nix
+++ b/modules/system/upstart-events/maintenance-shell.nix
@ -3,7 +3,7 @@
 ###### implementation

 {
-  jobAttrs.maintenance_shell =
+  jobs.maintenance_shell =
    { name = "maintenance-shell";

      startOn = [ "maintenance" "stalled" ];
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@ -73,10 +73,9 @@ let
          echo "$jobText" > $out/etc/event.d/${job.name}
        '';

-
  jobs =
    [pkgs.upstart] # for the built-in logd job
-    ++ map (job: job.upstartPkg) (attrValues config.jobAttrs);
+    ++ map (job: job.upstartPkg) (attrValues config.jobs);

  # Create an etc/event.d directory containing symlinks to the
  # specified list of Upstart job files.
@ -249,7 +248,7 @@ in
  
  options = {

-    jobAttrs = mkOption {
+    jobs = mkOption {
      default = {};
      description = ''
        This option defines the system jobs started and managed by the
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@ -233,7 +233,7 @@ in
    # Add the mount helpers to the system path so that `mount' can find them.
    environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
    
-    jobAttrs.filesystems =
+    jobs.filesystems =
      { startOn = [ "startup" "new-devices" "ip-up" ];

        script = task;
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@ -56,7 +56,7 @@ in

    environment.systemPackages = [pkgs.kbd];
  
-    jobAttrs.kbd =
+    jobs.kbd =
      { description = "Keyboard / console initialisation";

        startOn = "udev";
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@ -6,7 +6,7 @@

  config = {

-    jobAttrs.lvm =
+    jobs.lvm =
      { startOn = " udev"; # !!! or on new-devices

        script =
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@ -132,7 +132,7 @@ in
        pkgs.wirelesstools
      ];
    
-    jobAttrs.networkInterfaces = 
+    jobs.networkInterfaces = 
      { name = "network-interfaces";

        startOn = "udev";
--- a/modules/tasks/swap.nix
+++ b/modules/tasks/swap.nix
@ -66,7 +66,7 @@ in

  config = {

-    jobAttrs.swap =
+    jobs.swap =
      { task = true;
        
        startOn = ["startup" "new-devices"];
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@ -12,7 +12,7 @@ in
  
 {

-  jobAttrs.swraid =
+  jobs.swraid =
    { startOn = "udev"; # !!! or on "new-devices"
      
      script =
--- a/modules/tasks/tty-backgrounds.nix
+++ b/modules/tasks/tty-backgrounds.nix
@ -102,7 +102,7 @@ in
        target = "splash";
      };

-    jobAttrs.ttyBackgrounds =
+    jobs.ttyBackgrounds =
      { name = "tty-backgrounds";

        startOn = "udev";
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@ -9,7 +9,7 @@ with pkgs.lib;

  config = {

-    jobAttrs.backdoor =
+    jobs.backdoor =
      { startOn = "network-interfaces";
        
        preStart =