* extraSubservices: renamed serviceName' to serviceType' which is more

correct. svn path=/nixos/trunk/; revision=12026
2008-06-09 16:41:41 +00:00 · 2008-06-09 16:41:41 +00:00 · a49eb4d1f9
commit a49eb4d1f9
parent 5235acb1d7
1 changed files with 1 additions and 1 deletions
--- 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 = {