[Erp5-report] r31908 luke - in /erp5/trunk/buildout: ./ mysql-instance/ mysql-instance/temp...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jan 22 14:56:33 2010
New Revision: 31908

URL: http://svn.erp5.org?rev=31908&view=rev
Log:
 - remove supervisor and pidproxy from mysql instance profile

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

Added:
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in
Modified:
    erp5/trunk/buildout/development.cfg
    erp5/trunk/buildout/mysql-instance/buildout.cfg

Modified: erp5/trunk/buildout/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/development.cfg?rev=31908&r1=31907&r2=31908&view=diff
==============================================================================
--- erp5/trunk/buildout/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/development.cfg [utf8] Fri Jan 22 14:56:33 2010
@@ -11,5 +11,3 @@
   mysql-admin
   mysql_install_db
   mycnf
-  supervisor
-  pidproxy

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31908&r1=31907&r2=31908&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Fri Jan 22 14:56:33 2010
@@ -10,16 +10,13 @@
     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 @@
 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 @@
 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} ]
-

Added: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31908&view=auto
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in (added)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Fri Jan 22 14:56:33 2010
@@ -1,0 +1,3 @@
+#!/bin/sh
+
+${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt}