From a49eb4d1f9568302d5808828daff97b846fc5256 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 16:41:41 +0000
Subject: [PATCH] * extraSubservices: renamed `serviceName' to `serviceType'
 which is more   correct.

svn path=/nixos/trunk/; revision=12026
---
 upstart-jobs/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 0d40d4fd3e52..6a4e9116dc9d 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -53,7 +53,7 @@ let
       let 
         svcFunction =
           if svc ? function then svc.function
-          else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
+          else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";
         config = addDefaultOptionValues res.options
           (if svc ? config then svc.config else svc);
         defaults = {