* jobAttrs -> jobs.

svn path=/nixos/trunk/; revision=17769
This commit is contained in:
Eelco Dolstra 2009-10-12 18:09:34 +00:00
parent 40c9057a49
commit eba8f94069
71 changed files with 78 additions and 79 deletions

View File

@ -45,7 +45,7 @@ in
gid = config.ids.gids.audio;
};
jobAttrs.alsa =
jobs.alsa =
{ startOn = "udev";
preStart =

View File

@ -62,7 +62,7 @@ in
inherit gid;
};
jobAttrs.pulseaudio =
jobs.pulseaudio =
{ description = "PulseAudio system-wide server";
startOn = "startup";

View File

@ -72,7 +72,7 @@ in
environment.systemPackages = [mysql];
jobAttrs.mysql =
jobs.mysql =
{ description = "MySQL server";
startOn = "filesystems";

View File

@ -113,7 +113,7 @@ in
environment.systemPackages = [postgresql];
jobAttrs.postgresql =
jobs.postgresql =
{ description = "PostgreSQL server";
startOn = "${startDependency}/started";

View File

@ -76,7 +76,7 @@ in
config = mkIf config.powerManagement.enable {
jobAttrs.acpid =
jobs.acpid =
{ description = "ACPI daemon";
startOn = "udev";

View File

@ -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,

View File

@ -152,7 +152,7 @@ in
services.udev.packages = [extraUdevRules];
jobAttrs.udev =
jobs.udev =
{ startOn = "startup";
stopOn = "shutdown";

View File

@ -10,7 +10,7 @@ in
{
jobAttrs.klogd =
jobs.klogd =
{ description = "Kernel log daemon";
startOn = "syslogd";

View File

@ -47,7 +47,7 @@ in
config = {
jobAttrs.syslogd =
jobs.syslogd =
{ description = "Syslog daemon";
startOn = "udev";

View File

@ -113,7 +113,7 @@ in
gid = config.ids.gids.dovecot;
};
jobAttrs.dovecot =
jobs.dovecot =
{ description = "Dovecot IMAP/POP3 server";
startOn = "${startingDependency}/started";

View File

@ -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

View File

@ -72,7 +72,7 @@ in
source = pkgs.writeText "auto.master" cfg.autoMaster;
};
jobAttrs.autofs =
jobs.autofs =
{ description = "Filesystem automounter";
startOn = "network-interfaces/started";

View File

@ -36,7 +36,7 @@ in
services.dbus.enable = true;
services.dbus.packages = [ pkgs.disnix ];
jobAttrs.disnix =
jobs.disnix =
{ description = "Disnix server";
startOn = "dbus";

View File

@ -85,7 +85,7 @@ in
inherit gid;
};
jobAttrs.gpsd =
jobs.gpsd =
{ description = "GPSD daemon";
startOn = "network-interfaces/started";

View File

@ -188,7 +188,7 @@ in
target = "nix.machines";
};
jobAttrs.nixDaemon =
jobs.nixDaemon =
{ startOn = "startup";
script =

View File

@ -72,7 +72,7 @@ in
boot.extraTTYs = mkIf cfg.showManual [cfg.ttyNumber];
jobAttrs = mkIf cfg.showManual
jobs = mkIf cfg.showManual
{ nixosManual =
{ name = "nixos-manual";

View File

@ -40,7 +40,7 @@ in
boot.extraTTYs = [ cfg.tty ];
jobAttrs.rogue =
jobs.rogue =
{ description = "Rogue dungeon crawling game";
startOn = "udev";

View File

@ -68,7 +68,7 @@ in
config = {
jobAttrs =
jobs =
optionalAttrs cfgC.enable
{ synergyClient =

View File

@ -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.

View File

@ -64,7 +64,7 @@ in
description = "Zabbix daemon user";
};
jobAttrs.zabbix_agent =
jobs.zabbix_agent =
{ #name = "zabbix-agent"; !!! mkIf bug
description = "Zabbix agent daemon";

View File

@ -51,7 +51,7 @@ in
description = "Zabbix daemon user";
};
jobAttrs.zabbix_server =
jobs.zabbix_server =
{ #name = "zabbix-server"; !!! mkIf bug
description = "Zabbix server daemon";

View File

@ -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";

View File

@ -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";
};

View File

@ -115,7 +115,7 @@ in
environment.systemPackages = [ avahi ];
jobAttrs.avahi_daemon =
jobs.avahi_daemon =
{ name = "avahi-daemon";
startOn = "network-interfaces/started";

View File

@ -105,7 +105,7 @@ in
config = mkIf config.services.bind.enable {
jobAttrs.bind =
jobs.bind =
{ description = "BIND name server job";
preStart =

View File

@ -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";

View File

@ -110,7 +110,7 @@ in
home = stateDir;
};
jobAttrs.ddclient =
jobs.ddclient =
{ name = "ddclient";
startOn = "startup";

View File

@ -61,7 +61,7 @@ in
config = mkIf config.networking.useDHCP {
jobAttrs.dhclient =
jobs.dhclient =
{ startOn = "network-interfaces/started";
stopOn = "network-interfaces/stop";

View File

@ -108,7 +108,7 @@ in
config = mkIf config.services.dhcpd.enable {
jobAttrs.dhcpd =
jobs.dhcpd =
{ description = "DHCP server";
startOn = "network-interfaces/started";

View File

@ -50,7 +50,7 @@ in
config = mkIf cfg.enable {
jobAttrs.ejabberd =
jobs.ejabberd =
{ description = "EJabberd server";
startOn = "network-interface/started";

View File

@ -78,7 +78,7 @@ in
environment.systemPackages = [pkgs.iptables];
jobAttrs.firewall =
jobs.firewall =
{ startOn = "network-interfaces/started";
preStart =

View File

@ -191,7 +191,7 @@ in
home = "/var/empty";
};
jobAttrs.gnunetd =
jobs.gnunetd =
{ description = "The GNUnet Daemon";
startOn = "network-interfaces/started";

View File

@ -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 "";

View File

@ -55,7 +55,7 @@ in
config = mkIf config.networking.interfaceMonitor.enable {
jobAttrs.ifplugd =
jobs.ifplugd =
{ description = "Network interface connectivity monitor";
startOn = "network-interfaces/started";

View File

@ -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";

View File

@ -70,7 +70,7 @@ in
home = stateDir;
};
jobAttrs.ntpd =
jobs.ntpd =
{ description = "NTP daemon";
startOn = "ip-up";

View File

@ -49,7 +49,7 @@ in
message = "openfire assertion failed";
};
jobAttrs.openfire =
jobs.openfire =
{ description = "OpenFire XMPP server";
startOn = "${startDependency}/started";

View File

@ -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);
};

View File

@ -63,7 +63,7 @@ in
inherit gid;
};
jobAttrs.portmap =
jobs.portmap =
{ description = "ONC RPC portmap";
startOn = "network-interfaces/started";

View File

@ -77,7 +77,7 @@ in
home = stateDir;
};
jobAttrs.privoxy =
jobs.privoxy =
{ name = "privoxy";
startOn = "startup";

View File

@ -116,7 +116,7 @@ in
config = mkIf cfg.enable {
jobAttrs.lshd =
jobs.lshd =
{ description = "GNU lshd SSH2 daemon";
startOn = "network-interfaces/started";

View File

@ -108,7 +108,7 @@ in
home = "/var/empty";
};
jobAttrs.sshd = {
jobs.sshd = {
description = "OpenSSH server";

View File

@ -99,7 +99,7 @@ in
gid = config.ids.gids.ftp;
};
jobAttrs.vsftpd =
jobs.vsftpd =
{ description = "vsftpd server";
startOn = "network-interfaces/started";

View File

@ -37,7 +37,7 @@ in
environment.systemPackages = [pkgs.wpa_supplicant];
jobAttrs.wpa_supplicant =
jobs.wpa_supplicant =
{ startOn = "network-interfaces/started";
stopOn = "network-interfaces/stop";

View File

@ -119,7 +119,7 @@ in
config = mkIf cfg.enable {
jobAttrs.xinetd =
jobs.xinetd =
{ description = "xinetd server";
startOn = "network-interfaces/started";

View File

@ -155,7 +155,7 @@ in
}
];
jobAttrs.cupsd =
jobs.cupsd =
{ description = "CUPS printing daemon";
startOn = "network-interfaces/started";

View File

@ -63,7 +63,7 @@ in
gid = config.ids.gids.atd;
};
jobAttrs.atd =
jobs.atd =
{ description = "at daemon (atd)";
startOn = "startup";

View File

@ -66,7 +66,7 @@ in
environment.systemPackages = [pkgs.cron];
jobAttrs.cron =
jobs.cron =
{ description = "Cron daemon";
startOn = "startup";

View File

@ -97,7 +97,7 @@ in
environment.systemPackages = [ pkgs.fcron ];
jobAttrs.fcron =
jobs.fcron =
{ description = "fcron daemon";
startOn = "startup";

View File

@ -113,7 +113,7 @@ in
gid = config.ids.gids.messagebus;
};
jobAttrs.dbus =
jobs.dbus =
{ startOn = "udev";
stopOn = "shutdown";

View File

@ -17,7 +17,7 @@ in
description = "Name service cache daemon user";
};
jobAttrs.nscd =
jobs.nscd =
{ description = "Name Service Cache Daemon";
startOn = "startup";

View File

@ -49,7 +49,7 @@ in
home = stateDir;
};
jobAttrs.uptimed =
jobs.uptimed =
{ description = "Uptimed daemon";
startOn = "startup";

View File

@ -38,7 +38,7 @@ in
config = mkIf cfg.enable {
jobAttrs.gpm =
jobs.gpm =
{ description = "General purpose mouse";
startOn = "udev";

View File

@ -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";

View File

@ -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,

View File

@ -70,7 +70,7 @@ in
config = mkIf config.services.jboss.enable {
jobAttrs.jboss =
jobs.jboss =
{ description = "JBoss server";
exec = "${jbossService}/bin/control start";

View File

@ -101,7 +101,7 @@ in
home = "/homeless-shelter";
};
jobAttrs.tomcat =
jobs.tomcat =
{ description = "Apache Tomcat server";
startOn = "network-interface/started";

View File

@ -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";

View File

@ -348,7 +348,7 @@ in
services.hal.packages = halConfigFiles;
jobAttrs.xserver =
jobs.xserver =
{ startOn = if cfg.autorun then "hal" else "never";
environment =

View File

@ -3,7 +3,7 @@
###### implementation
{
jobAttrs.ctrl_alt_delete =
jobs.ctrl_alt_delete =
{ name = "ctrl-alt-delete";
startOn = "ctrlaltdel";

View File

@ -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" ] );
}

View File

@ -3,7 +3,7 @@
###### implementation
{
jobAttrs.maintenance_shell =
jobs.maintenance_shell =
{ name = "maintenance-shell";
startOn = [ "maintenance" "stalled" ];

View File

@ -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

View File

@ -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;

View File

@ -56,7 +56,7 @@ in
environment.systemPackages = [pkgs.kbd];
jobAttrs.kbd =
jobs.kbd =
{ description = "Keyboard / console initialisation";
startOn = "udev";

View File

@ -6,7 +6,7 @@
config = {
jobAttrs.lvm =
jobs.lvm =
{ startOn = " udev"; # !!! or on new-devices
script =

View File

@ -132,7 +132,7 @@ in
pkgs.wirelesstools
];
jobAttrs.networkInterfaces =
jobs.networkInterfaces =
{ name = "network-interfaces";
startOn = "udev";

View File

@ -66,7 +66,7 @@ in
config = {
jobAttrs.swap =
jobs.swap =
{ task = true;
startOn = ["startup" "new-devices"];

View File

@ -12,7 +12,7 @@ in
{
jobAttrs.swraid =
jobs.swraid =
{ startOn = "udev"; # !!! or on "new-devices"
script =

View File

@ -102,7 +102,7 @@ in
target = "splash";
};
jobAttrs.ttyBackgrounds =
jobs.ttyBackgrounds =
{ name = "tty-backgrounds";
startOn = "udev";

View File

@ -9,7 +9,7 @@ with pkgs.lib;
config = {
jobAttrs.backdoor =
jobs.backdoor =
{ startOn = "network-interfaces";
preStart =