From f60a0eb6ca652dc1fe47b8ad0e7926c9086541f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Fri, 22 Jan 2010 13:56:33 +0000
Subject: [PATCH] - 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
---
buildout/development.cfg | 2 --
buildout/mysql-instance/buildout.cfg | 32 ++++-----------------
buildout/mysql-instance/templates/mysqld.in | 3 ++
3 files changed, 9 insertions(+), 28 deletions(-)
create mode 100644 buildout/mysql-instance/templates/mysqld.in
diff --git a/buildout/development.cfg b/buildout/development.cfg
index 25d3789c34..32a1df2de0 100644
--- a/buildout/development.cfg
+++ b/buildout/development.cfg
@@ -11,5 +11,3 @@ parts +=
mysql-admin
mysql_install_db
mycnf
- supervisor
- pidproxy
diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/mysql-instance/buildout.cfg
index 0c99f36206..3b4739e68d 100644
--- a/buildout/mysql-instance/buildout.cfg
+++ b/buildout/mysql-instance/buildout.cfg
@@ -10,16 +10,13 @@ parts =
mysql-admin
mysql_install_db
mycnf
- supervisor
- pidproxy
+ mysqld-bin
[ports]
recipe = plone.recipe.command
command =
echo The following configuration items are active for this buildout
- echo Supervisor: ${:supervisor}
echo MySQL: ${:mysql}
-supervisor = 10000
mysql = 10002
[env]
@@ -35,22 +32,20 @@ recipe = collective.recipe.template
input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in
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]
recipe = plone.recipe.command
command =
${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}
[mycnf]
recipe = plone.recipe.command
command =
- echo
- echo These options are passed to mysqld_safe: ${:opt}
- echo
basedir=${buildout:mysql_software}
datadir=${buildout:mysql_datadir}
# files shall be in better places
@@ -58,18 +53,3 @@ pid=${:datadir}/mysql.pid
err = ${buildout:directory}/var/mysql.err.log
sock = ${:datadir}/mysql.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} ]
-
diff --git a/buildout/mysql-instance/templates/mysqld.in b/buildout/mysql-instance/templates/mysqld.in
new file mode 100644
index 0000000000..7256ff2fad
--- /dev/null
+++ b/buildout/mysql-instance/templates/mysqld.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt}
--
2.30.9