From 4341ef80d8b2195e84ae4d2c47d2298edab0ba32 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 28 Jan 2008 14:55:12 +0000
Subject: [PATCH] Fixed MySQL option

svn path=/nixos/trunk/; revision=10307
---
 system/options.nix | 69 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 7fad6af33c6c..332ae0217a19 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1470,6 +1470,40 @@
 
     };
 
+    mysql = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the MySQL server.
+	";
+      };
+      
+      port = mkOption {
+        default = "3306";
+	description = "Port of MySQL"; 
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which MySQL runs";
+      };
+      
+      datadir = mkOption {
+        default = "/var/mysql";
+	description = "Location where MySQL stores its table files";
+      };
+      
+      log_error = mkOption {
+        default = "/var/log/mysql_err.log";
+	description = "Location of the MySQL error logfile";
+      };
+      
+      pid_file = mkOption {
+        default = "/var/mysql/mysql.pid";
+	description = "Location of the file which stores the PID of the MySQL server";
+      };
+    };
+
     postgresql = {
       enable = mkOption {
         default = false;
@@ -1519,41 +1553,6 @@
 
   };
 
-  mysql = {
-      enable = mkOption {
-        default = false;
-	description = "
-	  Whether to enable the MySQL server.
-	";
-      };
-      
-      port = mkOption {
-        default = "3306";
-	description = "Port of MySQL"; 
-      };
-      
-      user = mkOption {
-        default = "nobody";
-	description = "User account under which MySQL runs";
-      };
-      
-      datadir = mkOption {
-        default = "/var/mysql";
-	description = "Location where MySQL stores its table files";
-      };
-      
-      log_error = mkOption {
-        default = "/var/log/mysql_err.log";
-	description = "Location of the MySQL error logfile";
-      };
-      
-      pid_file = mkOption {
-        default = "/var/mysql/mysql.pid";
-	description = "Location of the file which stores the PID of the MySQL server";
-      };
-    };
-
-
   installer = {
 
     nixpkgsURL = mkOption {