Commit 6faf3108 authored by Łukasz Nowak's avatar Łukasz Nowak

- 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
parent 088f7b96
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
[buildout] [buildout]
parts = parts =
ports
env env
mysql-bin mysql-bin
mysql-admin mysql-admin
...@@ -12,12 +11,11 @@ parts = ...@@ -12,12 +11,11 @@ parts =
mysqld-bin mysqld-bin
[ports] [ports]
recipe = plone.recipe.command
command =
echo The following configuration items are active for this buildout
echo MySQL: ${:mysql}
mysql = 10002 mysql = 10002
[hosts]
mysql = 127.0.0.1
[env] [env]
recipe = gocept.recipe.env recipe = gocept.recipe.env
...@@ -51,5 +49,3 @@ datadir=${buildout:mysql_datadir} ...@@ -51,5 +49,3 @@ datadir=${buildout:mysql_datadir}
pid=${:datadir}/mysql.pid pid=${:datadir}/mysql.pid
err = ${buildout:directory}/var/mysql.err.log err = ${buildout:directory}/var/mysql.err.log
sock = ${:datadir}/mysql.sock 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}
#!/bin/sh #!/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} $@
#!/bin/sh #!/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} $@
#!/bin/sh #!/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}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment