From 52c9a6c7562134c0e9537c1d25887202f5af2de7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 Feb 2007 19:04:30 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=8078

---
 system/options.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index f2718151f043..8bfe656c5dc1 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -489,8 +489,7 @@
     ";
   }
 
-  
-  /*  
+
   {
     name = ["services" "httpd" "user"];
     default = "wwwrun";
@@ -555,7 +554,7 @@
     ";
   }
 
-  
+
   {
     name = ["services" "httpd" "stateDir"];
     default = "/var/run/httpd";
@@ -616,6 +615,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "subservices" "subversion" "organization" "url"];
     default = null;
@@ -624,6 +624,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "subservices" "subversion" "organization" "logo"];
     default = null;
@@ -632,6 +633,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "extraSubservices" "enable"];
     default = false;
@@ -640,6 +642,7 @@
     ";
   }
 
+  
   {
     name = ["services" "httpd" "extraSubservices" "services"];
     default = [];
@@ -647,8 +650,8 @@
       Extra subservices to enable in the webserver.
     ";
   }
-  */
 
+  
   {
     name = ["installer" "nixpkgsURL"];
     default = "";