From 71075f67c2bdd8177938bef4ee9fe4eae6652988 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Fri, 19 Mar 2010 19:51:00 +0000
Subject: [PATCH] Use erp5.recipe.mysqlserver

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33936 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/instance-profiles/mysql.cfg | 40 +++++-----------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/buildout/instance-profiles/mysql.cfg b/buildout/instance-profiles/mysql.cfg
index ccb802d5b5..53f33ab77b 100644
--- a/buildout/instance-profiles/mysql.cfg
+++ b/buildout/instance-profiles/mysql.cfg
@@ -15,46 +15,20 @@ mysql_sock = ${:mysql_datadir}/mysql.sock
 mysql_error_log = ${buildout:log-directory}/mysql.err.log
 mysql_cnf_file = ${buildout:etc-directory}/my.cnf
 
-[mysql-bin]
-recipe = collective.recipe.template
-input = ${buildout:directory}/templates/mysql.in
-output = ${buildout:data-bin-directory}/mysql
-
-[mysqldump]
-recipe = collective.recipe.template
-input = ${buildout:directory}/templates/mysqldump.in
-output = ${buildout:data-bin-directory}/mysqldump
-
-[mysql-admin]
-recipe = collective.recipe.template
-input = ${buildout:directory}/templates/mysqladmin.in
-output = ${buildout:data-bin-directory}/mysqladmin
-
-[mysqld_safe-bin]
-recipe = collective.recipe.template
-input = ${buildout:directory}/templates/mysqld_safe.in
-output = ${buildout:data-bin-directory}/mysqld_safe
-
 [mysql-cnf]
 recipe = collective.recipe.template
 input = ${buildout:directory}/templates/my.cnf.in
 output = ${configuration:mysql_cnf_file}
 
 [mysql-instance]
-depends =
-  ${create-directories:command}
-  ${mysql-admin:output}
-  ${mysql-bin:output}
+depends = 
   ${mysql-cnf:output}
-  ${mysqld_safe-bin:output}
-  ${mysqldump:output}
-
-recipe = plone.recipe.command
-command =
-    mkdir -p ${configuration:mysql_datadir}
-    [ -f ${configuration:mysql_datadir}/ibdata1 ] || ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
-
-update-command = ${:command}
+recipe = erp5.recipe.mysqlserver
+mysql_software_bin = ${software_definition:mysql_software}/bin
+mysql_bin_folder =  ${buildout:data-bin-directory}
+mysql_datadir = ${configuration:mysql_datadir}
+mysql_cnf_file = ${configuration:mysql_cnf_file}
+mysql_auto_start = false
 
 [mysql-server-template]
 <= mysql-instance
-- 
2.30.9