* Declare options for sub-services.

* Add deprecated options for "serviceType", "serviceName", "function" and
  "config" without changing the behavior.

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

modules/module-list.nix

@@ -94,6 +94,7 @@
   ./services/ttys/mingetty.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/apache-httpd/per-server-options.nix
+  ./services/web-servers/apache-httpd/services.nix
   ./services/web-servers/jboss.nix
   ./services/web-servers/tomcat.nix
   ./services/x11/desktop-managers/default.nix

modules/services/web-servers/apache-httpd/default.nix

@@ -41,25 +41,14 @@ let
   # extensions of NixOS.
   callSubservices = serverInfo: defs:
     let f = svc:
-      let 
-        svcFunction =
-          if svc ? function then svc.function
-          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 = {
-          extraConfig = "";
-          extraModules = [];
-          extraModulesPre = [];
-          extraPath = [];
-          extraServerPath = [];
-          globalEnvVars = [];
-          robotsEntries = "";
-          startupScript = "";
-          options = {};
-        };
-        res = defaults // svcFunction {inherit config pkgs serverInfo servicesPath;};
-      in res;
+      rec {
+        config =
+          if res ? options then
+            addDefaultOptionValues res.options svc.config
+          else
+            svc.config;
+        res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
+      }.res;
     in map f defs;
 
 

modules/services/web-servers/apache-httpd/per-server-options.nix

@@ -3,7 +3,7 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{options, config, pkgs, ...}@moduleArguments:
+{options, config, pkgs, ...}:
 
 let
   inherit (pkgs.lib) mkOption addDefaultOptionValues types;
@@ -122,13 +122,6 @@ let
       ";
     };
 
-    extraSubservices = mkOption {
-      default = [];
-      description = "
-        Extra subservices to enable in the webserver.
-      ";
-    };
-
     enableUserDir = mkOption {
       default = false;
       description = "

modules/services/web-servers/apache-httpd/services.nix

@@ -0,0 +1,131 @@
+{options, config, pkgs, ...}:
+
+let
+  inherit (pkgs.lib) mkOption addDefaultOptionValues types;
+
+  mainServerArgs = {
+    config = config.services.httpd;
+    options = options.services.httpd;
+  };
+
+  subServiceOptions = {options, config, ...}: {
+    options = {
+
+      extraConfig = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+      extraModules = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraModulesPre = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraPath = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      extraServerPath = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      globalEnvVars = mkOption {
+        default = [];
+        description = "Not documented yet.";
+      };
+
+      robotsEntries = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+      startupScript = mkOption {
+        default = "";
+        description = "Not documented yet.";
+      };
+
+
+      serviceType = mkOption {
+        default = "";
+        description = "Obsolete name of <option>serviceName</option>.";
+        # serviceType is the old name of serviceName.
+        apply = x: config.serviceName;
+      };
+
+      serviceName = mkOption {
+        default = "";
+        example = "trac";
+        description = "
+          (Deprecated)
+
+          Identify a service by the name of the file containing it.  The
+          service expression is contained inside
+          <filename>./modules/services/web-servers/apache-httpd</filename>
+          directory.
+
+          Due to lack of documentation, this option will be replaced by
+          enable flags.
+        ";
+
+        # serviceName is the new name of serviceType.
+        extraConfigs = map (def: def.value) options.serviceType.definitions;
+      };
+
+      function = mkOption {
+        default = null;
+        description = "
+          (Deprecated) Add a function which configure the current sub-service.
+        ";
+        apply = f:
+          if isNull f then
+            import "${./.}/${config.serviceName}.nix"
+          else
+            f;
+      };
+
+      config = mkOption {
+        default = {};
+        description = "
+          (Deprecated) Define option values of the current sub-service.
+        ";
+      };
+
+    };
+  };
+
+
+  perServerOptions = {config, ...}: {
+
+    extraSubservices = mkOption {
+      default = [];
+      type = with types; listOf optionSet;
+      description = "
+        Extra subservices to enable in the webserver.
+      ";
+      options = [ subServiceOptions ];
+    };
+
+  };
+
+in
+
+{
+  options = {
+    services.httpd = {
+
+      virtualHosts = mkOption {
+        options = [ perServerOptions ];
+      };
+
+    }
+    // perServerOptions mainServerArgs
+    ;
+  };
+}