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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 28 14:47:25 2010
New Revision: 41827

URL: http://svn.erp5.org?rev=41827&view=rev
Log:
improve supervisord.conf template.

Modified:
    erp5/trunk/buildout/instance-profiles/zeo.cfg
    erp5/trunk/buildout/instance-profiles/zope-2.12.cfg
    erp5/trunk/buildout/instance-profiles/zope.cfg
    erp5/trunk/buildout/profiles/deployment-2.12.cfg

Modified: erp5/trunk/buildout/instance-profiles/zeo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zeo.cfg?rev=41827&r1=41826&r2=41827&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zeo.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zeo.cfg [utf8] Tue Dec 28 14:47:25 2010
@@ -13,11 +13,17 @@ recipe = plone.recipe.zeoserver
 zeo-address = 8100
 eggs =
   ${eggs:eggs}
+supervisor-priority = 20
+supervisor-program =
+  ${:supervisor-priority} ${:_buildout_section_name_} (redirect_stderr=true stdout_logfile=NONE) ${buildout:parts-directory}/${:_buildout_section_name_}/bin/runzeo
 
 [zeo-client-template]
 <= zope-instance-template
 zeo-client = on
 zeo-address = ${zeo_server:zeo-address}
+supervisor-priority = 30
+supervisor-program =
+  ${:supervisor-priority} ${:_buildout_section_name_} (redirect_stderr=true stdout_logfile=NONE) ${buildout:bin-directory}/runzope [-C ${buildout:parts-directory}/${:_buildout_section_name_}/etc/zope.conf]
 
 [zeo-client-front1]
 <= zeo-client-template

Modified: erp5/trunk/buildout/instance-profiles/zope-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zope-2.12.cfg?rev=41827&r1=41826&r2=41827&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zope-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zope-2.12.cfg [utf8] Tue Dec 28 14:47:25 2010
@@ -1,7 +1,7 @@
 [buildout]
 parts = zope-instance
 
-[zope-instance-template]
+[zope-instance]
 recipe = erp5.recipe.zope2instance
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
@@ -15,3 +15,10 @@ zope-conf-additional =
     method /Control_Panel/timer_service/process_timer?interval:int=5
     period 5
   </clock-server>
+supervisor-priority = 30
+supervisor-program =
+  ${:supervisor-priority} ${:_buildout_section_name_} (redirect_stderr=true stdout_logfile=NONE) ${buildout:bin-directory}/runzope [-C ${buildout:parts-directory}/${:_buildout_section_name_}/etc/zope.conf]
+
+# this name is only for backward compatibility
+[zope-instance-template]
+<= zope-instance

Modified: erp5/trunk/buildout/instance-profiles/zope.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zope.cfg?rev=41827&r1=41826&r2=41827&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] Tue Dec 28 14:47:25 2010
@@ -1,7 +1,7 @@
-# This configuration only contains a template part which should
-# be instaciated by another recipe.
+[buildout]
+parts = zope-instance
 
-[zope-instance-template]
+[zope-instance]
 recipe = erp5.recipe.zope2instance
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
@@ -16,3 +16,10 @@ zope-conf-additional =
   <timer-server>
     interval 5
   </timer-server>
+supervisor-priority = 30
+supervisor-program =
+  ${:supervisor-priority} ${:_buildout_section_name_} (redirect_stderr=true stdout_logfile=NONE) ${buildout:bin-directory}/runzope [-C ${buildout:parts-directory}/${:_buildout_section_name_}/etc/zope.conf]
+
+# this name is only for backward compatibility
+[zope-instance-template]
+<= zope-instance

Modified: erp5/trunk/buildout/profiles/deployment-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment-2.12.cfg?rev=41827&r1=41826&r2=41827&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] Tue Dec 28 14:47:25 2010
@@ -16,6 +16,7 @@ extends =
   ../instance-profiles/supervisor.cfg
   ../instance-profiles/testing.cfg
   ../instance-profiles/testrunner.cfg
+  ../instance-profiles/zeo.cfg
   ../instance-profiles/zope-2.12.cfg
   ../profiles/common.cfg
   ../profiles/software-definition.cfg