From f1373852f8c42b63e0c0834d42012765607b1e8d Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Thu, 2 Dec 2010 05:19:22 +0000 Subject: [PATCH] Syncronize file with official-2.12.cfg git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41009 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/profiles/official.cfg | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index 76edf21651..ce48f78e81 100644 --- a/buildout/profiles/official.cfg +++ b/buildout/profiles/official.cfg @@ -1,14 +1,11 @@ -# Official configuration -# Generates full ERP5 software with all needed dependencies (including python, -# mysql, frontend, load balancer, etc.) [buildout] -software_home = ${:directory} - extends = ../profiles/versions.cfg ../profiles/software-definition.cfg - ../software-profiles/products-erp5.cfg ../software-profiles/apache.cfg + ../profiles/common.cfg + ../profiles/software-common.cfg + ../software-profiles/products-erp5.cfg ../software-profiles/erp5.cfg ../software-profiles/file.cfg ../software-profiles/fonts.cfg @@ -35,8 +32,6 @@ extends = ../software-profiles/varnish.cfg ../software-profiles/xpdf.cfg ../software-profiles/zope-2.8.cfg - ../profiles/common.cfg - ../profiles/software-common.cfg versions = versions @@ -80,6 +75,16 @@ parts = liberation-fonts ipaex-fonts +[bootstrap2.4] +# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0 +# is used it is required to go back to default -- use own version of python +python = buildout + +[rebootstrap] +# This is first version of python +version = 1 +section = python2.4 + [software_definition] software_home = ${buildout:directory} # as mysql-python part, which uses mysql-python-env is not depending directly @@ -93,13 +98,3 @@ mysql_software = ${mysql-tritonn-5.0:location} # instance setups as standard executable because all eggs are available only # by this script and not into the binary. executable = ${:software_home}/bin/python2.4 - -[bootstrap2.4] -# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0 -# is used it is required to go back to default -- use own version of python -python = buildout - -[rebootstrap] -# This is first version of python -version = 1 -section = python2.4 -- 2.30.9