- Implemented rootPassword option to automatically configure the root password (by default it's empty, which you usually don't want)

- Implemented initialScript option to configure database properties on first startup (such as granting permissions)


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

modules/services/databases/mysql.nix

@@ -71,6 +71,16 @@ in
 	  { name = "bardatabase"; schema = ./bardatabase.sql; }
 	];
       };
+      
+      initialScript = mkOption {
+        default = null;
+	description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
+      };
+      
+      rootPassword = mkOption {
+        default = null;
+	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";	
+      };
     };
     
   };
@@ -98,6 +108,7 @@ in
                 mkdir -m 0700 -p ${cfg.dataDir}
                 chown -R ${cfg.user} ${cfg.dataDir}
                 ${mysql}/bin/mysql_install_db ${mysqldOptions}
+		touch /tmp/mysql_init
             fi
 
             mkdir -m 0700 -p ${cfg.pidDir}
@@ -123,6 +134,8 @@ in
                 sleep 1
             done
 
+	    if [ -f /tmp/mysql_init ]
+	    then
 	        # Create initial databases
 
                 ${concatMapStrings (database: 
@@ -141,6 +154,26 @@ in
 		        ) | ${mysql}/bin/mysql -u root -N
                     fi
                   '') cfg.initialDatabases}            
+	
+	        # Execute initial script
+		
+		${optionalString (cfg.initialScript != null)
+		  ''
+		    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
+		  ''}
+		
+	        # Change root password
+		
+		${optionalString (cfg.rootPassword != null)
+		  ''
+		    ( echo "use mysql;"
+		      echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
+		      echo "flush privileges;"
+		    ) | ${mysql}/bin/mysql -u root -N
+		  ''}
+		  
+	      rm /tmp/mysql_init
+	    fi
 	  '';
 	  	  
         # !!! Need a postStart script to wait until mysqld is ready to