diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/mysql-instance/buildout.cfg index 7d177aba322d78432de40d18cc1797c27e8acc4d..c788f82bd2147c5125d5cee08b7a076a288812c5 100644 --- a/buildout/mysql-instance/buildout.cfg +++ b/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} diff --git a/buildout/mysql-instance/templates/mysql.in b/buildout/mysql-instance/templates/mysql.in index 68241e23d1386ee0c99a328ebcb349391dee33dc..a3b6355664bbc6fb6e47497fdbeecb93dd1f24dd 100755 --- a/buildout/mysql-instance/templates/mysql.in +++ b/buildout/mysql-instance/templates/mysql.in @@ -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} $@ diff --git a/buildout/mysql-instance/templates/mysqladmin.in b/buildout/mysql-instance/templates/mysqladmin.in index 3dfa8a84cf4967438e4aa6be015a04b15c3544f7..0062f587f2c66e3e9b7271b1035a753d29641057 100755 --- a/buildout/mysql-instance/templates/mysqladmin.in +++ b/buildout/mysql-instance/templates/mysqladmin.in @@ -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} $@ diff --git a/buildout/mysql-instance/templates/mysqld.in b/buildout/mysql-instance/templates/mysqld.in index 1c2e0e0044c2fefefa343c2bf920421b74cb3ac6..84173a736fff63ebe391d15cd47c403d21ce816f 100755 --- a/buildout/mysql-instance/templates/mysqld.in +++ b/buildout/mysql-instance/templates/mysqld.in @@ -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}