From c4ee72bbf5538448a14261ccec89945694ae64fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 17 Feb 2010 14:46:16 +0000 Subject: [PATCH] - put generic profiles to profile directory - modify paths in a way that all is accesible relating to buildout:directory git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32685 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/buildout.cfg | 2 +- buildout/development-minimal.cfg | 3 -- .../{ => profiles}/deployment-minimal.cfg | 2 +- buildout/{ => profiles}/deployment.cfg | 2 +- buildout/profiles/development-minimal.cfg | 3 ++ buildout/{ => profiles}/development.cfg | 2 +- buildout/{ => profiles}/minimal.cfg | 6 ++-- buildout/{ => profiles}/official.cfg | 36 +++++++++---------- buildout/{ => profiles}/test-minimal.cfg | 2 +- buildout/{ => profiles}/test.cfg | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 buildout/development-minimal.cfg rename buildout/{ => profiles}/deployment-minimal.cfg (52%) rename buildout/{ => profiles}/deployment.cfg (83%) create mode 100644 buildout/profiles/development-minimal.cfg rename buildout/{ => profiles}/development.cfg (97%) rename buildout/{ => profiles}/minimal.cfg (54%) rename buildout/{ => profiles}/official.cfg (68%) rename buildout/{ => profiles}/test-minimal.cfg (52%) rename buildout/{ => profiles}/test.cfg (61%) diff --git a/buildout/buildout.cfg b/buildout/buildout.cfg index 50fe3f532f..0592c0580c 100644 --- a/buildout/buildout.cfg +++ b/buildout/buildout.cfg @@ -1,2 +1,2 @@ [buildout] -extends = official.cfg +extends = profiles/official.cfg diff --git a/buildout/development-minimal.cfg b/buildout/development-minimal.cfg deleted file mode 100644 index b8ae1262d5..0000000000 --- a/buildout/development-minimal.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[buildout] -extends = minimal.cfg - diff --git a/buildout/deployment-minimal.cfg b/buildout/profiles/deployment-minimal.cfg similarity index 52% rename from buildout/deployment-minimal.cfg rename to buildout/profiles/deployment-minimal.cfg index 7e528aa4fa..2df38a2150 100644 --- a/buildout/deployment-minimal.cfg +++ b/buildout/profiles/deployment-minimal.cfg @@ -1,5 +1,5 @@ [buildout] -extends = minimal.cfg +extends = ../profiles/minimal.cfg parts += # zope-instance diff --git a/buildout/deployment.cfg b/buildout/profiles/deployment.cfg similarity index 83% rename from buildout/deployment.cfg rename to buildout/profiles/deployment.cfg index b83ff4c907..de9d583bf0 100644 --- a/buildout/deployment.cfg +++ b/buildout/profiles/deployment.cfg @@ -1,5 +1,5 @@ [buildout] -extends = official.cfg +extends = ../profiles/official.cfg parts += pidproxy supervisor diff --git a/buildout/profiles/development-minimal.cfg b/buildout/profiles/development-minimal.cfg new file mode 100644 index 0000000000..2ef1248e86 --- /dev/null +++ b/buildout/profiles/development-minimal.cfg @@ -0,0 +1,3 @@ +[buildout] +extends = ../profiles/minimal.cfg + diff --git a/buildout/development.cfg b/buildout/profiles/development.cfg similarity index 97% rename from buildout/development.cfg rename to buildout/profiles/development.cfg index 56a91b1bda..6b501a7e81 100644 --- a/buildout/development.cfg +++ b/buildout/profiles/development.cfg @@ -1,5 +1,5 @@ [buildout] -extends = official.cfg +extends = ../profiles/official.cfg parts += start-mysql-instance diff --git a/buildout/minimal.cfg b/buildout/profiles/minimal.cfg similarity index 54% rename from buildout/minimal.cfg rename to buildout/profiles/minimal.cfg index dc9855956a..0657be0fb3 100644 --- a/buildout/minimal.cfg +++ b/buildout/profiles/minimal.cfg @@ -1,8 +1,8 @@ [buildout] extends = - profiles/versions.cfg - software-profiles/erp5.cfg - instance-profiles/zope.cfg + ../profiles/versions.cfg + ../software-profiles/erp5.cfg + ../instance-profiles/zope.cfg parts = cmf15 diff --git a/buildout/official.cfg b/buildout/profiles/official.cfg similarity index 68% rename from buildout/official.cfg rename to buildout/profiles/official.cfg index a016614973..1a4e541cfb 100644 --- a/buildout/official.cfg +++ b/buildout/profiles/official.cfg @@ -1,23 +1,23 @@ [buildout] extends = - instance-profiles/mysql.cfg - instance-profiles/oood.cfg - instance-profiles/zope.cfg - profiles/versions.cfg - software-profiles/apache.cfg - software-profiles/erp5.cfg - software-profiles/flare.cfg - software-profiles/haproxy.cfg - software-profiles/imagemagick.cfg - software-profiles/libevent.cfg - software-profiles/memcached.cfg - software-profiles/mysql-tritonn-5.0.cfg - software-profiles/ocropus.cfg - software-profiles/oood.cfg - software-profiles/openoffice-bin.cfg - software-profiles/python-2.4.cfg - software-profiles/varnish.cfg - software-profiles/zope-2.8.cfg + ../instance-profiles/mysql.cfg + ../instance-profiles/oood.cfg + ../instance-profiles/zope.cfg + ../profiles/versions.cfg + ../software-profiles/apache.cfg + ../software-profiles/erp5.cfg + ../software-profiles/flare.cfg + ../software-profiles/haproxy.cfg + ../software-profiles/imagemagick.cfg + ../software-profiles/libevent.cfg + ../software-profiles/memcached.cfg + ../software-profiles/mysql-tritonn-5.0.cfg + ../software-profiles/ocropus.cfg + ../software-profiles/oood.cfg + ../software-profiles/openoffice-bin.cfg + ../software-profiles/python-2.4.cfg + ../software-profiles/varnish.cfg + ../software-profiles/zope-2.8.cfg var-directory = ${:directory}/var etc-directory = ${:var-directory}/etc diff --git a/buildout/test-minimal.cfg b/buildout/profiles/test-minimal.cfg similarity index 52% rename from buildout/test-minimal.cfg rename to buildout/profiles/test-minimal.cfg index 7e528aa4fa..2df38a2150 100644 --- a/buildout/test-minimal.cfg +++ b/buildout/profiles/test-minimal.cfg @@ -1,5 +1,5 @@ [buildout] -extends = minimal.cfg +extends = ../profiles/minimal.cfg parts += # zope-instance diff --git a/buildout/test.cfg b/buildout/profiles/test.cfg similarity index 61% rename from buildout/test.cfg rename to buildout/profiles/test.cfg index c5ad8d4008..80c6c9849a 100644 --- a/buildout/test.cfg +++ b/buildout/profiles/test.cfg @@ -1,5 +1,5 @@ [buildout] -extends = official.cfg +extends = ../profiles/official.cfg parts += # mysql-instance -- 2.30.9