added configuration option for extraSubservices, which allows you to plugin an arbitrary service into the webserver.

svn path=/nixos/trunk/; revision=7926

system/options.nix

@@ -578,6 +578,21 @@
     ";
   }
 
+  {
+    name = ["services" "httpd" "extraSubservices" "enable"];
+    default = false;
+    description = "
+      Whether to enable the extra subservices in the webserver.
+    ";
+  }
+
+  {
+    name = ["services" "httpd" "extraSubservices" "services"];
+    default = false;
+    description = "
+      Extra subservices to enable in the webserver.
+    ";
+  }
 
   {
     name = ["installer" "nixpkgsURL"];

upstart-jobs/httpd.nix

@@ -3,6 +3,7 @@
 let
 
   getCfg = option: config.get ["services" "httpd" option];
+  getCfgs = options: config.get (["services" "httpd"] ++ options); 
   getCfgSvn = option: config.get ["services" "httpd" "subservices" "subversion" option];
 
   optional = conf: subService:
@@ -29,7 +30,7 @@ let
     subServices =
     
       # The Subversion subservice.
-      optional (getCfgSvn "enable") (
+      (optional (getCfgSvn "enable") (
         let dataDir = getCfgSvn "dataDir"; in
         import ../services/subversion {
           reposDir = dataDir + "/repos";
@@ -52,11 +53,16 @@ let
 
           inherit pkgs;
         })
+      )
+      ++
 
+      (optional (getCfgs ["extraSubservices" "enable"]) (
+        (getCfgs ["extraSubservices" "services"]) webServer pkgs
+        )
+      )
       ;
   };
   
-  
 in
 
 {