Commit f60a0eb6 authored by Łukasz Nowak's avatar Łukasz Nowak

- remove supervisor and pidproxy from mysql instance profile

We can use supervisor globally in buildout by providing hooks from instance
profiles.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31908 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5dd4388d
...@@ -11,5 +11,3 @@ parts += ...@@ -11,5 +11,3 @@ parts +=
mysql-admin mysql-admin
mysql_install_db mysql_install_db
mycnf mycnf
supervisor
pidproxy
...@@ -10,16 +10,13 @@ parts = ...@@ -10,16 +10,13 @@ parts =
mysql-admin mysql-admin
mysql_install_db mysql_install_db
mycnf mycnf
supervisor mysqld-bin
pidproxy
[ports] [ports]
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
echo The following configuration items are active for this buildout echo The following configuration items are active for this buildout
echo Supervisor: ${:supervisor}
echo MySQL: ${:mysql} echo MySQL: ${:mysql}
supervisor = 10000
mysql = 10002 mysql = 10002
[env] [env]
...@@ -35,22 +32,20 @@ recipe = collective.recipe.template ...@@ -35,22 +32,20 @@ recipe = collective.recipe.template
input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in
output = ${buildout:directory}/bin/mysqladmin output = ${buildout:directory}/bin/mysqladmin
[mysqld-bin]
recipe = collective.recipe.template
input = ${buildout:directory}/mysql-instance/templates/mysqld.in
output = ${buildout:directory}/bin/mysqld
[mysql_install_db] [mysql_install_db]
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
${buildout:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir} ${buildout:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir}
echo
echo After starting supervisord, you may want to run:
echo ${buildout:directory}/bin/mysqladmin -u root password 'new-password'
echo
update-command = ${mysql_install_db:command} update-command = ${mysql_install_db:command}
[mycnf] [mycnf]
recipe = plone.recipe.command recipe = plone.recipe.command
command = command =
echo
echo These options are passed to mysqld_safe: ${:opt}
echo
basedir=${buildout:mysql_software} basedir=${buildout:mysql_software}
datadir=${buildout:mysql_datadir} datadir=${buildout:mysql_datadir}
# files shall be in better places # files shall be in better places
...@@ -58,18 +53,3 @@ pid=${:datadir}/mysql.pid ...@@ -58,18 +53,3 @@ 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
opt = --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock} opt = --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock}
[pidproxy]
# this should've been provided by collective.recipe.supervisor itself
recipe = zc.recipe.egg
eggs = supervisor
scripts = pidproxy
[supervisor]
recipe = collective.recipe.supervisor
port = ${ports:supervisor}
serverurl = http://127.0.0.1:${ports:supervisor}
pp = ${buildout:directory}/eggs/supervisor-3.0a7-py2.5.egg/supervisor/pidproxy.py
programs =
10 mysql ${buildout:bin-directory}/pidproxy [ ${mycnf:pid} ${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt} ]
#!/bin/sh
${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt}
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