[Erp5-report] r33936 rafael - /erp5/trunk/buildout/instance-profiles/mysql.cfg

[nobody at svn.erp5.org]

Author: rafael
Date: Fri Mar 19 20:51:00 2010
New Revision: 33936

URL: http://svn.erp5.org?rev=33936&view=rev
Log:
Use erp5.recipe.mysqlserver

Modified:
    erp5/trunk/buildout/instance-profiles/mysql.cfg

Modified: erp5/trunk/buildout/instance-profiles/mysql.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/mysql.cfg?rev=33936&r1=33935&r2=33936&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] Fri Mar 19 20:51:00 2010
@@ -15,46 +15,20 @@
 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