From ebea2dafa13be99e240820a6c5d468ea32ae81f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Feb 2008 17:03:48 +0000
Subject: [PATCH] * Quick hack to get the old Apache job working.

svn path=/nixos/trunk/; revision=10785
---
 upstart-jobs/httpd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index afafcf4f173..88eee31926f 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -17,7 +17,6 @@ let
   logDir = cfg.logDir;
   stateDir = cfg.stateDir;
   enableSSL = false;
-  extraDirectories = cfg.extraDirectories + extraConfig;
   applicationMappings = cfg.mod_jk.applicationMappings;
   
   startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces";
@@ -30,8 +29,9 @@ let
 
     inherit hostName httpPort httpsPort
       user group adminAddr logDir stateDir
-      extraDirectories applicationMappings;
+      applicationMappings;
     noUserDir = !cfg.enableUserDir;
+    extraDirectories = extraConfig + cfg.extraConfig;
     
     subServices =
     
@@ -72,11 +72,11 @@ let
         )
         )
       )
-      ++
+      /* ++
 
       (optional cfg.extraSubservices.enable
         (map (service : service webServer pkgs) cfg.extraSubservices.services)
-      );
+      ) */;
   };
   
 in