From c12fa76da0be1020e607dcd9db60aed4c6f1c579 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Wed, 22 Dec 2010 16:25:54 +0000
Subject: [PATCH] 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.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41676 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
buildout/instance-profiles/cloudooo.cfg | 5 ++++-
buildout/instance-profiles/mysql.cfg | 4 ++++
buildout/instance-profiles/oood.cfg | 4 ++++
buildout/profiles/deployment-2.12.cfg | 12 +++---------
buildout/profiles/deployment.cfg | 2 +-
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/buildout/instance-profiles/cloudooo.cfg b/buildout/instance-profiles/cloudooo.cfg
index 38c32b7600..9d2f9f8597 100644
--- a/buildout/instance-profiles/cloudooo.cfg
+++ b/buildout/instance-profiles/cloudooo.cfg
@@ -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}]
diff --git a/buildout/instance-profiles/mysql.cfg b/buildout/instance-profiles/mysql.cfg
index 1140599a3b..8deb02d581 100644
--- a/buildout/instance-profiles/mysql.cfg
+++ b/buildout/instance-profiles/mysql.cfg
@@ -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 ]
diff --git a/buildout/instance-profiles/oood.cfg b/buildout/instance-profiles/oood.cfg
index ef79428bfa..24f40632f8 100644
--- a/buildout/instance-profiles/oood.cfg
+++ b/buildout/instance-profiles/oood.cfg
@@ -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}
diff --git a/buildout/profiles/deployment-2.12.cfg b/buildout/profiles/deployment-2.12.cfg
index c3132ae71d..885d8d0594 100644
--- a/buildout/profiles/deployment-2.12.cfg
+++ b/buildout/profiles/deployment-2.12.cfg
@@ -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 =
diff --git a/buildout/profiles/deployment.cfg b/buildout/profiles/deployment.cfg
index b9e63932ea..6dcc38f968 100644
--- a/buildout/profiles/deployment.cfg
+++ b/buildout/profiles/deployment.cfg
@@ -22,7 +22,7 @@ extends =
parts =
software-links
mysql-instance
- oood-instance
+ cloudooo-instance
supervisor-instance
memcached-instance
--
2.30.9