* Fix subversion test and change the name of the "config" option to

"configuration" because it may interfered with sub-modules keywords.

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

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

@@ -44,9 +44,9 @@ let
       rec {
         config =
           if res ? options then
-            addDefaultOptionValues res.options svc.config
+            addDefaultOptionValues res.options svc.configuration
           else
-            svc.config;
+            svc.configuration;
         res = svc // svc.function {inherit config pkgs serverInfo servicesPath;};
       }.res;
     in map f defs;

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

@@ -53,14 +53,12 @@ let
 
 
       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)
@@ -90,7 +88,7 @@ let
             f;
       };
 
-      config = mkOption {
+      configuration = mkOption {
         default = {};
         description = "
           (Deprecated) Define option values of the current sub-service.

tests/subversion.nix

@@ -56,9 +56,11 @@ rec {
           services.httpd.adminAddr = "e.dolstra@tudelft.nl";
           services.httpd.extraSubservices =
             [ { serviceType = "subversion";
-                urlPrefix = "";
-                dataDir = "/data/subversion";
-                userCreationDomain = "192.168.0.0/16";
+                configuration = {
+                  urlPrefix = "";
+                  dataDir = "/data/subversion";
+                  userCreationDomain = "192.168.0.0/16";
+                };
               }
             ];
           nixpkgs.config.packageOverrides = overrides;