- make templates more template like

 - reorganise and cleanup namespaces


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31941 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/mysql-instance/buildout.cfg

@@ -4,7 +4,6 @@
 
 [buildout]
 parts =
-    ports
     env
     mysql-bin
     mysql-admin
@@ -12,12 +11,11 @@ parts =
     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 @@ datadir=${buildout:mysql_datadir}
 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}

buildout/mysql-instance/templates/mysql.in

 #!/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} $@

buildout/mysql-instance/templates/mysqladmin.in

 #!/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} $@

buildout/mysql-instance/templates/mysqld.in

 #!/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}