Commit 291085c4 authored by Łukasz Nowak's avatar Łukasz Nowak

- cleanup and share more configuration

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31975 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7fc44859
No related merge requests found
[buildout] [buildout]
extends = official.cfg extends = official.cfg
mysql_datadir = ${buildout:directory}/var/mysql
parts += parts +=
mysql-bin mysql-bin
......
...@@ -13,6 +13,11 @@ parts = ...@@ -13,6 +13,11 @@ parts =
[configuration] [configuration]
mysql_port = 10002 mysql_port = 10002
mysql_host = 127.0.0.1 mysql_host = 127.0.0.1
mysql_datadir = ${buildout:directory}/var/mysql
mysql_pid = ${:mysql_datadir}/mysql.pid
mysql_sock = ${:mysql_datadir}/mysql.sock
# XXX/TODO: mysql_error_log shall be in var/log
mysql_error_log = ${buildout:directory}/var/mysql.err.log
[mysql-bin] [mysql-bin]
recipe = collective.recipe.template recipe = collective.recipe.template
...@@ -32,7 +37,7 @@ output = ${buildout:directory}/bin/mysqld ...@@ -32,7 +37,7 @@ output = ${buildout:directory}/bin/mysqld
[mysql-instance] [mysql-instance]
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
${software_definition:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir} ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
update-command = ${:command} update-command = ${:command}
[start-mysql-instance] [start-mysql-instance]
...@@ -42,15 +47,5 @@ update-command = ${:command} ...@@ -42,15 +47,5 @@ update-command = ${:command}
[stop-mysql-instance] [stop-mysql-instance]
recipe = plone.recipe.command recipe = plone.recipe.command
command = kill `cat ${mycnf:pid}` command = kill `cat ${configuration:mysql_pid}`
update-command = ${:command} update-command = ${:command}
[mycnf]
recipe = plone.recipe.command
command =
basedir=${software_definition:mysql_software}
datadir=${buildout:mysql_datadir}
# files shall be in better places
pid=${:datadir}/mysql.pid
err = ${buildout:directory}/var/mysql.err.log
sock = ${:datadir}/mysql.sock
#!/bin/sh #!/bin/sh
${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${mycnf:pid} --log-error=${mycnf:err} --basedir=${mycnf:basedir} --datadir=${mycnf:datadir} --socket=${mycnf:sock} ${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${configuration:mysql_pid} --log-error=${configuration:mysql_error_log} --basedir=${software_definition:mysql_software} --datadir=${configuration:mysql_datadir} --socket=${configuration:mysql_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