[Erp5-report] r31902 luke - in /erp5/trunk/buildout: ./ mysql-tritonn-5.0-instance/ mysql-t...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jan 22 13:36:39 2010
New Revision: 31902

URL: http://svn.erp5.org?rev=31902&view=rev
Log:
 - stabilise mysql instance profile

development.cfg:
 - define mysql_datadir for development profile
official.cfg:
 - globally define used mysql software component in official profile
mysql-tritonn-5.0-instance/buildout.cfg:
 - fix copy and paste issue with mysql_install_db
 - use profile configuration to access files produced by software component
 - made options less verbose

mysql-tritonn-5.0-instance/templates/mysqladmin.in:
mysql-tritonn-5.0-instance/templates/mysql.in:
 - use profile configuration to choose software component

Modified:
    erp5/trunk/buildout/development.cfg
    erp5/trunk/buildout/mysql-tritonn-5.0-instance/buildout.cfg
    erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysql.in
    erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysqladmin.in
    erp5/trunk/buildout/official.cfg

Modified: erp5/trunk/buildout/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/development.cfg?rev=31902&r1=31901&r2=31902&view=diff
==============================================================================
--- erp5/trunk/buildout/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/development.cfg [utf8] Fri Jan 22 13:36:39 2010
@@ -1,5 +1,6 @@
 [buildout]
 extends = official.cfg
+mysql_datadir = ${buildout:directory}/var/mysql
 
 parts +=
   mysql-instance

Modified: erp5/trunk/buildout/mysql-tritonn-5.0-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0-instance/buildout.cfg?rev=31902&r1=31901&r2=31902&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0-instance/buildout.cfg [utf8] Fri Jan 22 13:36:39 2010
@@ -33,15 +33,15 @@
 [mysql-admin]
 recipe = collective.recipe.template
 input = ${buildout:directory}/mysql-tritonn-5.0-instance/templates/mysqladmin.in
-output = ${buildout:directory}/bin/mysqladmin[mysql_install_db]
+output = ${buildout:directory}/bin/mysqladmin
 
 [mysql_install_db]
 recipe = plone.recipe.command
 command = 
-    ${mysql-tritonn-5.0:location}/parts/bin/mysql_install_db --datadir=${mycnf:datadir}
+    ${buildout:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir}
     echo 
     echo After starting supervisord, you may want to run:
-    echo ${buildout:directory}/parts/mysql/bin/mysqladmin -u root password 'new-password'
+    echo ${buildout:directory}/bin/mysqladmin -u root password 'new-password'
     echo
 update-command = ${mysql_install_db:command}
 
@@ -49,14 +49,15 @@
 recipe = plone.recipe.command
 command =
     echo
-    echo These options are passed to mysqld_safe: ${mycnf:opt}
+    echo These options are passed to mysqld_safe: ${:opt}
     echo
-basedir=${mysql-tritonn-5.0:location}
-datadir=${buildout:directory}/var
-pid=${mycnf:datadir}/mysql.pid
-err = ${mycnf:datadir}/log/mysql.err
-sock = ${mycnf:datadir}/mysql.sock
-opt = --port=${ports:mysql} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock}
+basedir=${buildout:mysql_software}
+datadir=${buildout:mysql_datadir}
+# files shall be in better places
+pid=${:datadir}/mysql.pid
+err = ${buildout:directory}/mysql.err.log
+sock = ${:datadir}/mysql.sock
+opt = --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock}
 
 [pidproxy]
 # this should've been provided by collective.recipe.supervisor itself
@@ -70,5 +71,5 @@
 serverurl = http://127.0.0.1:${ports:supervisor}
 pp = ${buildout:directory}/eggs/supervisor-3.0a7-py2.5.egg/supervisor/pidproxy.py
 programs =
-    10 mysql ${buildout:bin-directory}/pidproxy [ ${mycnf:pid} ${mysql-tritonn-5.0:location}/bin/mysqld_safe ${mycnf:opt} ]
+    10 mysql ${buildout:bin-directory}/pidproxy [ ${mycnf:pid} ${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt} ]
 

Modified: erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysql.in?rev=31902&r1=31901&r2=31902&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysql.in [utf8] Fri Jan 22 13:36:39 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${mysql-tritonn-5.0:location}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${buildout:mysql_software}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*

Modified: erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysqladmin.in?rev=31902&r1=31901&r2=31902&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0-instance/templates/mysqladmin.in [utf8] Fri Jan 22 13:36:39 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${mysql-tritonn-5.0:location}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${buildout:mysql_software}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=31902&r1=31901&r2=31902&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Fri Jan 22 13:36:39 2010
@@ -27,3 +27,6 @@
   openoffice
   erp5-bt5
   erp5-products
+
+# XXX: shall be moved to mysql software buildout
+mysql_software = ${mysql-tritonn-5.0:location}