[Erp5-report] r32445 luke - in /erp5/trunk/buildout: mysql-instance/buildout.cfg official.cfg

[nobody at svn.erp5.org]

Author: luke
Date: Thu Feb 11 18:00:50 2010
New Revision: 32445

URL: http://svn.erp5.org?rev=32445&view=rev
Log:
 - define directories globally
 - create common directories globally

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

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=32445&r1=32444&r2=32445&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Thu Feb 11 18:00:50 2010
@@ -10,11 +10,11 @@
 [configuration]
 mysql_port = 10002
 mysql_host = 127.0.0.1
-mysql_datadir = ${buildout:directory}/var/mysql
+mysql_datadir = ${buildout:var-directory}/mysql
 mysql_pid = ${:mysql_datadir}/mysql.pid
 mysql_sock = ${:mysql_datadir}/mysql.sock
-mysql_error_log = ${buildout:directory}/var/log/mysql.err.log
-mysql_cnf_file = ${buildout:directory}/var/etc/my.cnf
+mysql_error_log = ${buildout:log-directory}/mysql.err.log
+mysql_cnf_file = ${buildout:etc-directory}/my.cnf
 
 [mysql-bin]
 recipe = collective.recipe.template
@@ -32,20 +32,19 @@
 output = ${buildout:directory}/bin/mysqld
 
 [mysql-cnf]
-depends = ${etc-directory:command}
 recipe = collective.recipe.template
 input = ${buildout:directory}/mysql-instance/templates/my.cnf.in
 output = ${configuration:mysql_cnf_file}
 
 [mysql-instance]
-depends = ${log-directory:command}
 recipe = plone.recipe.command
 command =
-    ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
+    mkdir -p ${configuration:mysql_datadir}
+    ${buildout:bin-directory}/mysql_install_db --datadir=${configuration:mysql_datadir}
 
 [start-mysql-instance]
 recipe = plone.recipe.command
-command = ${buildout:bin-directory}/mysqld &
+command = ${buildout:bin-directory}/mysqld --defaults-file=${configuration:mysql_cnf_file} &
 update-command = ${:command}
 
 [stop-mysql-instance]

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32445&r1=32444&r2=32445&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Thu Feb 11 18:00:50 2010
@@ -13,6 +13,10 @@
   varnish/buildout.cfg
   zope-2.8/buildout.cfg
   zope-instance/buildout.cfg
+
+var-directory = ${:directory}/var
+etc-directory = ${:var-directory}/etc
+log-directory = ${:var-directory}/log
 
 versions = versions
 find-links =
@@ -53,13 +57,12 @@
   echo "Required header files: ${requirements:development}"
 update-command = ${:command}
 
-[etc-directory]
+[create-directories]
 recipe = plone.recipe.command
-command = mkdir -p ${buildout:directory}/var/etc
-
-[log-directory]
-recipe = plone.recipe.command
-command = mkdir -p ${buildout:directory}/var/log
+command =
+  mkdir -p ${buildout:etc-directory}
+  mkdir -p ${buildout:var-directory}
+  mkdir -p ${buildout:log-directory}
 
 [software_definition]
 mysql_software = ${mysql-tritonn-5.0:location}