* Remove needs to call getPort to access the server port. This is made

possible by using sub-modules arguments.

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

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

@@ -10,7 +10,7 @@ let
 
   httpd = pkgs.apacheHttpd;
 
-  getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
+  getPort = cfg: cfg.port;
 
   extraModules = attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = filter builtins.isAttrs extraModules;

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

@@ -3,12 +3,18 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{config, pkgs, ...}:
+{options, config, pkgs, ...}@moduleArguments:
 
 let
   inherit (pkgs.lib) mkOption addDefaultOptionValues types;
 
-  perServerOptions = {forMainServer}: {
+  mainServerArgs = {
+    config = config.services.httpd;
+    options = options.services.httpd;
+  };
+
+
+  perServerOptions = {forMainServer}: {config, ...}: {
 
     hostName = mkOption {
       default = "localhost";
@@ -26,10 +32,12 @@ let
     };
 
     port = mkOption {
-      default = 0;
+      default = if config.enableSSL then 443 else 80;
+      type = with types; uniq int;
       description = "
-        Port for the server.  0 means use the default port: 80 for http
-        and 443 for https (i.e. when enableSSL is set).
+        Port for the server.  The default port depends on the
+        <option>enableSSL</option> option of this server. (80 for http and
+        443 for https).
       ";
     };
 
@@ -175,7 +183,7 @@ in
       };
 
     }
-    // perServerOptions {forMainServer = true;}
+    // perServerOptions {forMainServer = true;} mainServerArgs
     ;
   };
 }