[Erp5-report] r41676 kazuhiko - in /erp5/trunk/buildout: instance-profiles/ profiles/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Dec 22 17:25:54 2010
New Revision: 41676

URL: http://svn.erp5.org?rev=41676&view=rev
Log:
use cloudooo instead of oood.
* cloudoooctl cannot be used with supervisord, because it daemonise by itself.
* separating 'supervisor_programs' configuration for each cfg file is still not good, because it is added just by loading *.cfg, that is triggered by deployment.cfg, thus all supervisor_programs will be added even if we don't specify several parts in instance buildout.cfg.

Modified:
    erp5/trunk/buildout/instance-profiles/cloudooo.cfg
    erp5/trunk/buildout/instance-profiles/mysql.cfg
    erp5/trunk/buildout/instance-profiles/oood.cfg
    erp5/trunk/buildout/profiles/deployment-2.12.cfg
    erp5/trunk/buildout/profiles/deployment.cfg

Modified: erp5/trunk/buildout/instance-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/cloudooo.cfg?rev=41676&r1=41675&r2=41676&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] Wed Dec 22 17:25:54 2010
@@ -25,6 +25,9 @@ paths = 
 
 [cloudooo-instance]
 recipe = erp5.recipe.cloudoooinstance
+depends =
+  ${paster:eggs}
+  ${create-log-directory:paths}
 daemon = true # only true or false
 conf-output = ${buildout:etc-directory}/cloudooo.conf
 ctl-output = ${buildout:data-bin-directory}/cloudoooctl
@@ -61,4 +64,4 @@ server-port = 8011
 
 [configuration]
 supervisor_programs +=
-  30 cloudooo (autorestart=true stopsignal=1 stopwaitsecs=20) ${cloudooo-instance-template:ctl-output}
+  30 cloudooo ${buildout:bin-directory}/paster [serve ${cloudooo-instance:conf-output}]

Modified: erp5/trunk/buildout/instance-profiles/mysql.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/mysql.cfg?rev=41676&r1=41675&r2=41676&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] Wed Dec 22 17:25:54 2010
@@ -39,3 +39,7 @@ mysqld-extra-configuration = 
 
 [mysql-server-template]
 <= mysql-instance
+
+[configuration]
+supervisor_programs +=
+  10 mysql (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]

Modified: erp5/trunk/buildout/instance-profiles/oood.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/oood.cfg?rev=41676&r1=41675&r2=41676&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] Wed Dec 22 17:25:54 2010
@@ -44,3 +44,7 @@ update-command = ${:command}
 
 [conversion-server-template]
 <= oood-instance
+
+[configuration]
+supervisor_programs +=
+  20 oood (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}

Modified: erp5/trunk/buildout/profiles/deployment-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment-2.12.cfg?rev=41676&r1=41675&r2=41676&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] Wed Dec 22 17:25:54 2010
@@ -1,7 +1,7 @@
 # This Configuration file is used to to define a standard deployment, without 
 # any create instances. This should create the basic services required for run 
-# one ERP5 instance, like MySQL server, Oood and so on. For use this configuration
-# it is required build a software home previously.
+# one ERP5 instance, like MySQL server, CloudOoo and so on. For use this
+# configuration # it is required build a software home previously.
 
 [buildout]
 extends =
@@ -11,7 +11,6 @@ extends =
   ../instance-profiles/memcached.cfg
   ../instance-profiles/mysql-database.cfg
   ../instance-profiles/mysql.cfg
-  ../instance-profiles/oood.cfg
   ../instance-profiles/sphinx.cfg
   ../instance-profiles/supervisor.cfg
   ../instance-profiles/testing.cfg
@@ -24,7 +23,7 @@ extends =
 parts =
   eggs
   mysql-instance
-  oood-instance
+  cloudooo-instance
   supervisor-instance
   memcached-instance
 
@@ -97,11 +96,6 @@ eggs =
 extra-paths =
   ${itools:lib}
 
-[configuration]
-supervisor_programs =
-  10 mysql (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]
-  20 oood (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}
-
 #[software-links]
 #recipe = plone.recipe.command
 #command =

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=41676&r1=41675&r2=41676&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Wed Dec 22 17:25:54 2010
@@ -22,7 +22,7 @@ extends =
 parts =
   software-links
   mysql-instance
-  oood-instance
+  cloudooo-instance
   supervisor-instance
   memcached-instance