From d06556e274bed57fb98fa21289d1bd368aa9f54f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2009 14:27:43 +0000
Subject: [PATCH] * Get rid of the `experimental' flag.

svn path=/nixos/branches/modular-nixos/; revision=16010
---
 doc/config-examples/svn-server.nix                    | 1 -
 modules/services/web-servers/apache-httpd/default.nix | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/doc/config-examples/svn-server.nix b/doc/config-examples/svn-server.nix
index a3c3b46cf244..7f2dafe16adb 100644
--- a/doc/config-examples/svn-server.nix
+++ b/doc/config-examples/svn-server.nix
@@ -17,7 +17,6 @@
 
     httpd = {
       enable = true;
-      experimental = true;
       adminAddr = "admin@example.org";
 
       subservices = {
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 60185c6bbc19..1d5281f25d9f 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -15,13 +15,6 @@ let
           ";
         };
 
-        experimental = mkOption {
-          default = false;
-          description = "
-            Whether to use the new-style Apache configuration.
-          ";
-        };
-
         extraConfig = mkOption {
           default = "";
           description = "
@@ -565,7 +558,7 @@ let
 in
 
 
-mkIf (config.services.httpd.enable && config.services.httpd.experimental) {
+mkIf config.services.httpd.enable {
   require = [
     options
   ];