mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 01:04:25 +00:00
renamed "all-interfaces" to "networking"
svn path=/nixos/trunk/; revision=32780
This commit is contained in:
parent
29b6b8769f
commit
8bfe513e75
@ -114,7 +114,7 @@ in
|
||||
jobs.dovecot =
|
||||
{ description = "Dovecot IMAP/POP3 server";
|
||||
|
||||
startOn = "started all-interfaces";
|
||||
startOn = "started networking";
|
||||
|
||||
preStart =
|
||||
''
|
||||
|
@ -123,7 +123,7 @@ in
|
||||
jobs.dovecot2 =
|
||||
{ description = "Dovecot IMAP/POP3 server";
|
||||
|
||||
startOn = "started all-interfaces";
|
||||
startOn = "started networking";
|
||||
|
||||
preStart =
|
||||
''
|
||||
|
@ -305,7 +305,7 @@ in
|
||||
# accurate way is unlikely to be better.
|
||||
{ description = "Postfix mail server";
|
||||
|
||||
startOn = "started all-interfaces";
|
||||
startOn = "started networking";
|
||||
|
||||
daemonType = "none";
|
||||
|
||||
|
@ -125,8 +125,8 @@ in
|
||||
|
||||
description = "IRCD Hybrid server";
|
||||
|
||||
startOn = "started all-interfaces";
|
||||
stopOn = "stopping all-interfaces";
|
||||
startOn = "started networking";
|
||||
stopOn = "stopping networking";
|
||||
|
||||
exec = "${ircdService}/bin/control start";
|
||||
};
|
||||
|
@ -48,7 +48,7 @@ in
|
||||
jobs.openfire =
|
||||
{ description = "OpenFire XMPP server";
|
||||
|
||||
startOn = "started all-interfaces ${extraStartDependency}";
|
||||
startOn = "started networking ${extraStartDependency}";
|
||||
|
||||
script =
|
||||
''
|
||||
|
@ -553,7 +553,7 @@ in
|
||||
|
||||
description = "Apache HTTPD";
|
||||
|
||||
startOn = "started all-interfaces and filesystem"
|
||||
startOn = "started networking and filesystem"
|
||||
# Hacky. Some subservices depend on Postgres
|
||||
# (e.g. Mediawiki), but they don't have a way to declare
|
||||
# that dependency. So just start httpd after postgresql if
|
||||
|
@ -36,7 +36,7 @@ in
|
||||
jobs.xfs =
|
||||
{ description = "X Font Server";
|
||||
|
||||
startOn = "started all-interfaces";
|
||||
startOn = "started networking";
|
||||
|
||||
exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
|
||||
};
|
||||
|
@ -283,8 +283,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
jobs.allInterfaces = {
|
||||
name = "all-interfaces";
|
||||
jobs.networking = {
|
||||
name = "networking";
|
||||
description = "all required interfaces are up";
|
||||
startOn = concatStringsSep " and " (map (job: "started ${job.name}") cfg.interfaceJobs);
|
||||
stopOn = concatStringsSep " and " (map (job: "stopping ${job.name}") cfg.interfaceJobs);
|
||||
|
Loading…
Reference in New Issue
Block a user