From 8bfe513e7505e4c7b97bfc53c7d40600637eb721 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 4 Mar 2012 18:44:42 +0000
Subject: [PATCH] renamed "all-interfaces" to "networking"

svn path=/nixos/trunk/; revision=32780
---
 modules/services/mail/dovecot.nix                     | 2 +-
 modules/services/mail/dovecot2.nix                    | 2 +-
 modules/services/mail/postfix.nix                     | 2 +-
 modules/services/networking/ircd-hybrid/default.nix   | 4 ++--
 modules/services/networking/openfire.nix              | 2 +-
 modules/services/web-servers/apache-httpd/default.nix | 2 +-
 modules/services/x11/xfs.nix                          | 2 +-
 modules/tasks/network-interfaces.nix                  | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 1679966a698b..4c6ee85ac31c 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -114,7 +114,7 @@ in
     jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         preStart =
           ''
diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 9c91fde2f206..15a0ecce325b 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -123,7 +123,7 @@ in
     jobs.dovecot2 =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "started all-interfaces";
+        startOn = "started networking";
 
         preStart =
           ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 4b13ad7f6b36..1eff4a39e1ed 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -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";
 
diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix
index d60c10ca9405..99fe02db5db8 100644
--- a/modules/services/networking/ircd-hybrid/default.nix
+++ b/modules/services/networking/ircd-hybrid/default.nix
@@ -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";
       };
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index c0b6a671994b..d5c18c0675cf 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -48,7 +48,7 @@ in
     jobs.openfire =
       { description = "OpenFire XMPP server";
 
-        startOn = "started all-interfaces ${extraStartDependency}";
+        startOn = "started networking ${extraStartDependency}";
 
         script =
           ''
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 16bcd6f20f6b..935a5e1be1ab 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -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
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 37cb004a9559..f4a40dbb08fd 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -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}";
       };
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index ef8e486ebcfc..fc8ebcddca4d 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -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);