Author: mkwik
Date: Sun Mar 4 18:44:42 2012
New Revision: 32780
URL: https://nixos.org/websvn/nix/?rev=32780&sc=1
Log:
renamed "all-interfaces" to "networking"
Modified:
nixos/trunk/modules/services/mail/dovecot.nix
nixos/trunk/modules/services/mail/dovecot2.nix
nixos/trunk/modules/services/mail/postfix.nix
nixos/trunk/modules/services/networking/ircd-hybrid/default.nix
nixos/trunk/modules/services/networking/openfire.nix
nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
nixos/trunk/modules/services/x11/xfs.nix
nixos/trunk/modules/tasks/network-interfaces.nix
Modified: nixos/trunk/modules/services/mail/dovecot.nix
==============================================================================
--- nixos/trunk/modules/services/mail/dovecot.nix Sun Mar 4 17:49:00
2012 (r32779)
+++ nixos/trunk/modules/services/mail/dovecot.nix Sun Mar 4 18:44:42
2012 (r32780)
@@ -114,7 +114,7 @@
jobs.dovecot =
{ description = "Dovecot IMAP/POP3 server";
- startOn = "started all-interfaces";
+ startOn = "started networking";
preStart =
''
Modified: nixos/trunk/modules/services/mail/dovecot2.nix
==============================================================================
--- nixos/trunk/modules/services/mail/dovecot2.nix Sun Mar 4 17:49:00
2012 (r32779)
+++ nixos/trunk/modules/services/mail/dovecot2.nix Sun Mar 4 18:44:42
2012 (r32780)
@@ -123,7 +123,7 @@
jobs.dovecot2 =
{ description = "Dovecot IMAP/POP3 server";
- startOn = "started all-interfaces";
+ startOn = "started networking";
preStart =
''
Modified: nixos/trunk/modules/services/mail/postfix.nix
==============================================================================
--- nixos/trunk/modules/services/mail/postfix.nix Sun Mar 4 17:49:00
2012 (r32779)
+++ nixos/trunk/modules/services/mail/postfix.nix Sun Mar 4 18:44:42
2012 (r32780)
@@ -305,7 +305,7 @@
# accurate way is unlikely to be better.
{ description = "Postfix mail server";
- startOn = "started all-interfaces";
+ startOn = "started networking";
daemonType = "none";
Modified: nixos/trunk/modules/services/networking/ircd-hybrid/default.nix
==============================================================================
--- nixos/trunk/modules/services/networking/ircd-hybrid/default.nix Sun Mar
4 17:49:00 2012 (r32779)
+++ nixos/trunk/modules/services/networking/ircd-hybrid/default.nix Sun Mar
4 18:44:42 2012 (r32780)
@@ -125,8 +125,8 @@
description = "IRCD Hybrid server";
- startOn = "started all-interfaces";
- stopOn = "stopping all-interfaces";
+ startOn = "started networking";
+ stopOn = "stopping networking";
exec = "${ircdService}/bin/control start";
};
Modified: nixos/trunk/modules/services/networking/openfire.nix
==============================================================================
--- nixos/trunk/modules/services/networking/openfire.nix Sun Mar 4
17:49:00 2012 (r32779)
+++ nixos/trunk/modules/services/networking/openfire.nix Sun Mar 4
18:44:42 2012 (r32780)
@@ -48,7 +48,7 @@
jobs.openfire =
{ description = "OpenFire XMPP server";
- startOn = "started all-interfaces ${extraStartDependency}";
+ startOn = "started networking ${extraStartDependency}";
script =
''
Modified: nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
==============================================================================
--- nixos/trunk/modules/services/web-servers/apache-httpd/default.nix Sun Mar
4 17:49:00 2012 (r32779)
+++ nixos/trunk/modules/services/web-servers/apache-httpd/default.nix Sun Mar
4 18:44:42 2012 (r32780)
@@ -553,7 +553,7 @@
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
Modified: nixos/trunk/modules/services/x11/xfs.nix
==============================================================================
--- nixos/trunk/modules/services/x11/xfs.nix Sun Mar 4 17:49:00 2012
(r32779)
+++ nixos/trunk/modules/services/x11/xfs.nix Sun Mar 4 18:44:42 2012
(r32780)
@@ -36,7 +36,7 @@
jobs.xfs =
{ description = "X Font Server";
- startOn = "started all-interfaces";
+ startOn = "started networking";
exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
};
Modified: nixos/trunk/modules/tasks/network-interfaces.nix
==============================================================================
--- nixos/trunk/modules/tasks/network-interfaces.nix Sun Mar 4 17:49:00
2012 (r32779)
+++ nixos/trunk/modules/tasks/network-interfaces.nix Sun Mar 4 18:44:42
2012 (r32780)
@@ -283,8 +283,8 @@
'';
};
- 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);
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
