[Erp5-report] r31975 luke - in /erp5/trunk/buildout: ./ mysql-instance/ mysql-instance/temp...

[nobody at svn.erp5.org]

Author: luke
Date: Tue Jan 26 14:25:55 2010
New Revision: 31975

URL: http://svn.erp5.org?rev=31975&view=rev
Log:
 - cleanup and share more configuration

Modified:
    erp5/trunk/buildout/development.cfg
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in

Modified: erp5/trunk/buildout/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/development.cfg?rev=31975&r1=31974&r2=31975&view=diff
==============================================================================
--- erp5/trunk/buildout/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/development.cfg [utf8] Tue Jan 26 14:25:55 2010
@@ -1,6 +1,5 @@
 [buildout]
 extends = official.cfg
-mysql_datadir = ${buildout:directory}/var/mysql
 
 parts +=
   mysql-bin

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31975&r1=31974&r2=31975&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Tue Jan 26 14:25:55 2010
@@ -13,6 +13,11 @@
 [configuration]
 mysql_port = 10002
 mysql_host = 127.0.0.1
+mysql_datadir = ${buildout:directory}/var/mysql
+mysql_pid = ${:mysql_datadir}/mysql.pid
+mysql_sock = ${:mysql_datadir}/mysql.sock
+# XXX/TODO: mysql_error_log shall be in var/log
+mysql_error_log = ${buildout:directory}/var/mysql.err.log
 
 [mysql-bin]
 recipe = collective.recipe.template
@@ -32,7 +37,7 @@
 [mysql-instance]
 recipe = plone.recipe.command
 command = 
-    ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir}
+    ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
 update-command = ${:command}
 
 [start-mysql-instance]
@@ -42,15 +47,5 @@
 
 [stop-mysql-instance]
 recipe = plone.recipe.command
-command = kill `cat ${mycnf:pid}`
+command = kill `cat ${configuration:mysql_pid}`
 update-command = ${:command}
-
-[mycnf]
-recipe = plone.recipe.command
-command =
-basedir=${software_definition:mysql_software}
-datadir=${buildout:mysql_datadir}
-# files shall be in better places
-pid=${:datadir}/mysql.pid
-err = ${buildout:directory}/var/mysql.err.log
-sock = ${:datadir}/mysql.sock

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31975&r1=31974&r2=31975&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Tue Jan 26 14:25:55 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock}
+${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${configuration:mysql_pid} --log-error=${configuration:mysql_error_log} --basedir=${software_definition:mysql_software} --datadir=${configuration:mysql_datadir} --socket=${configuration:mysql_sock}