diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-31 13:26:06 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-31 13:26:06 +0100 |
commit | c1159edc65989d6b33aa68e0822ec6e388576b8e (patch) | |
tree | 6f15c91b1f24c7a360d1fbd76548bbe1a655d105 /nixos/modules/system/upstart | |
parent | 456d8ec52b640ff67c88d04c89ea59836953b38f (diff) | |
download | nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar.gz nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar.bz2 nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar.lz nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar.xz nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.tar.zst nixlib-c1159edc65989d6b33aa68e0822ec6e388576b8e.zip |
Remove remaining references to Upstart
Diffstat (limited to 'nixos/modules/system/upstart')
-rw-r--r-- | nixos/modules/system/upstart/upstart.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/nixos/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix index 464041ebe6b2..aa5c8dfe64b2 100644 --- a/nixos/modules/system/upstart/upstart.nix +++ b/nixos/modules/system/upstart/upstart.nix @@ -107,17 +107,18 @@ let type = types.str; example = "sshd"; description = '' - Name of the Upstart job. + Name of the job, mapped to the systemd unit + <literal><replaceable>name</replaceable>.service</literal>. ''; }; startOn = mkOption { - # !!! Re-enable this once we're on Upstart >= 0.6. #type = types.str; default = ""; description = '' - The Upstart event that triggers this job to be started. - If empty, the job will not start automatically. + The Upstart event that triggers this job to be started. Some + are mapped to systemd dependencies; otherwise you will get a + warning. If empty, the job will not start automatically. ''; }; @@ -125,7 +126,7 @@ let type = types.str; default = "starting shutdown"; description = '' - The Upstart event that triggers this job to be stopped. + Ignored; this was the Upstart event that triggers this job to be stopped. ''; }; @@ -144,7 +145,7 @@ let default = ""; description = '' Shell commands executed before the job is stopped - (i.e. before Upstart kills the job's main process). This can + (i.e. before systemd kills the job's main process). This can be used to cleanly shut down a daemon. ''; }; @@ -192,7 +193,7 @@ let type = types.str; default = "none"; description = '' - Determines how Upstart detects when a daemon should be + Determines how systemd detects when a daemon should be considered “running”. The value <literal>none</literal> means that the daemon is considered ready immediately. The value <literal>fork</literal> means that the daemon will fork once. @@ -261,8 +262,13 @@ in jobs = mkOption { default = {}; description = '' - This option defines the system jobs started and managed by the - Upstart daemon. + This option is a legacy method to define system services, + dating from the era where NixOS used Upstart instead of + systemd. You should use <option>systemd.services</option> + instead. Services defined using <option>jobs</option> are + mapped automatically to <option>systemd.services</option>, but + may not work perfectly; in particular, most + <option>startOn</option> conditions are not supported. ''; type = types.loaOf types.optionSet; options = [ jobOptions upstartJob ]; |