From be0a681645159621c24b3471bee9deba48ccd7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 17 Feb 2010 16:32:08 +0000 Subject: [PATCH] - remove instance local start/stop parts - in reality development profile is like deployment, but with starting supervisor and using local software home git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32700 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/instance-profiles/mysql.cfg | 13 ------------- buildout/instance-profiles/oood.cfg | 16 ---------------- buildout/profiles/development.cfg | 8 ++++---- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/buildout/instance-profiles/mysql.cfg b/buildout/instance-profiles/mysql.cfg index 8d1aee7f90..04cffcc498 100644 --- a/buildout/instance-profiles/mysql.cfg +++ b/buildout/instance-profiles/mysql.cfg @@ -47,16 +47,3 @@ recipe = plone.recipe.command command = mkdir -p ${configuration:mysql_datadir} ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${configuration:mysql_datadir} - -[start-mysql-instance] -depends = ${mysql-instance:command} -recipe = plone.recipe.command -command = - ${buildout:data-bin-directory}/mysqld_safe & - sleep 5 -update-command = ${:command} - -[stop-mysql-instance] -recipe = plone.recipe.command -command = kill `cat ${configuration:mysql_pid}` -update-command = ${:command} diff --git a/buildout/instance-profiles/oood.cfg b/buildout/instance-profiles/oood.cfg index fc9cc999d1..a4f67fa8a3 100644 --- a/buildout/instance-profiles/oood.cfg +++ b/buildout/instance-profiles/oood.cfg @@ -27,21 +27,5 @@ recipe = collective.recipe.template input = ${buildout:directory}/templates/oood-runserw.in output = ${buildout:data-bin-directory}/oood-runserw -[start-oood-instance] -depends = ${oood-instance:output} -recipe = plone.recipe.command -command = - ${buildout:data-bin-directory}/oood-runserw --start & - sleep 5 -update-command = ${:command} - -[stop-oood-instance] -depends = ${oood-instance:output} -recipe = plone.recipe.command -command = - ${buildout:data-bin-directory}/oood-runserw --stop & - sleep 5 -update-command = ${:command} - [requirements] binary = Xvfb diff --git a/buildout/profiles/development.cfg b/buildout/profiles/development.cfg index 6b501a7e81..ff1248de67 100644 --- a/buildout/profiles/development.cfg +++ b/buildout/profiles/development.cfg @@ -1,12 +1,12 @@ [buildout] -extends = ../profiles/official.cfg +extends = ../profiles/deployment.cfg parts += - start-mysql-instance - start-oood-instance + supervisor-start zope-instance -# use locally developed recipe +[software_definition] +software_home = ${buildout:directory} [zope-instance] recipe = erp5.recipe.standaloneinstance -- 2.30.9