From 5235acb1d7c7a84d842938f292f1630996d75c22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Jun 2008 16:35:24 +0000
Subject: [PATCH] * extraSubservices: the subservice config no longer needs to
 be   in a `config' attribute.  So instead of

    extraSubservices = [
      { serviceName = "foo";
        config = {
          bla = ...;
        };
      }
    ];

  you can write

    extraSubservices = [
      { serviceName = "foo";
        bla = ...;
      }
    ];

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

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 8bcd2c7aaa9..0d40d4fd3e5 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -54,7 +54,8 @@ let
         svcFunction =
           if svc ? function then svc.function
           else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
-        config = addDefaultOptionValues res.options svc.config;
+        config = addDefaultOptionValues res.options
+          (if svc ? config then svc.config else svc);
         defaults = {
           extraConfig = "";
           extraModules = [];