[Erp5-report] r41009 rafael - /erp5/trunk/buildout/profiles/official.cfg

[nobody at svn.erp5.org]

Author: rafael
Date: Thu Dec  2 06:19:22 2010
New Revision: 41009

URL: http://svn.erp5.org?rev=41009&view=rev
Log:
Syncronize file with official-2.12.cfg

Modified:
    erp5/trunk/buildout/profiles/official.cfg

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=41009&r1=41008&r2=41009&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Thu Dec  2 06:19:22 2010
@@ -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:loc
 # 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