[Erp5-report] r31941 luke - in /erp5/trunk/buildout/mysql-instance: ./ templates/

[nobody at svn.erp5.org]

Author: luke
Date: Mon Jan 25 17:09:28 2010
New Revision: 31941

URL: http://svn.erp5.org?rev=31941&view=rev
Log:
 - make templates more template like
 - reorganise and cleanup namespaces

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

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31941&r1=31940&r2=31941&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Mon Jan 25 17:09:28 2010
@@ -4,7 +4,6 @@
 
 [buildout]
 parts =
-    ports
     env
     mysql-bin
     mysql-admin
@@ -12,11 +11,10 @@
     mysqld-bin
 
 [ports]
-recipe = plone.recipe.command
-command = 
-    echo The following configuration items are active for this buildout
-    echo MySQL: ${:mysql}
 mysql = 10002
+
+[hosts]
+mysql = 127.0.0.1
 
 [env]
 recipe = gocept.recipe.env
@@ -51,5 +49,3 @@
 pid=${:datadir}/mysql.pid
 err = ${buildout:directory}/var/mysql.err.log
 sock = ${:datadir}/mysql.sock
-mysql_opt = --no-defaults -P ${ports:mysql} -S ${mycnf:sock}
-mysqld_opt = --no-defaults --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock}

Modified: erp5/trunk/buildout/mysql-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysql.in?rev=31941&r1=31940&r2=31941&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] Mon Jan 25 17:09:28 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysql ${mycnf:mysql_opt} $@
+${software_definition:mysql_software}/bin/mysql --no-defaults --protocol=tcp --host=${hosts:mysql} --port=${ports:mysql} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in?rev=31941&r1=31940&r2=31941&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] Mon Jan 25 17:09:28 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqladmin ${mycnf:mysql_opt} $@
+${software_definition:mysql_software}/bin/mysqladmin --no-defaults --protocol=tcp --host=${hosts:mysql} --port=${ports:mysql} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31941&r1=31940&r2=31941&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Mon Jan 25 17:09:28 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:mysqld_opt}
+${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${ports:mysql} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock}