From 8843f3c287bb686570b64023611a1ac6f2cfa73d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 2 Aug 2007 21:26:38 +0000
Subject: [PATCH] Corrected dependencies for gw6c; also made httpd depend on
 gw6c if needed.

svn path=/nixos/trunk/; revision=9029
---
 upstart-jobs/gw6c.nix  | 4 ++--
 upstart-jobs/httpd.nix | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/gw6c.nix b/upstart-jobs/gw6c.nix
index faf1519d2a9..812d4081bab 100644
--- a/upstart-jobs/gw6c.nix
+++ b/upstart-jobs/gw6c.nix
@@ -17,8 +17,8 @@ in
 	job = "
 description \"Gateway6 client\"
 
-start on network/interfaces started
-stop on network/interfaces stop
+start on network-interfaces/started
+stop on network-interfaces/stop
 
 respawn ${gw6cService}/bin/control start
 ";
diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 276df7971fd..eec1583293a 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -22,6 +22,9 @@ let
   enableSSL = false;
   noUserDir = getCfg "noUserDir";
   extraDirectories = getCfg "extraDirectories";
+
+  startingDependency = if (config.get [ "services" "gw6c" "enable" ]) 
+	then "gw6c" else "network-interfaces";
   
   webServer = import ../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
@@ -99,8 +102,8 @@ in
   job = "
 description \"Apache HTTPD\"
 
-start on network-interfaces/started
-stop on network-interfaces/stop
+start on ${startingDependency}/started
+stop on ${startingDependency}/stop
 
 start script
     ${webServer}/bin/control prepare