Move erp5 profile to erp5 stack.

All ERP5 profile is now in a single place. Moreover, use slapos.cfg stack.

Move erp5 profile to erp5 stack.
All ERP5 profile is now in a single place. Moreover, use slapos.cfg stack.
aab7af8b · Cédric de Saint Martin · c38bbae5 · aab7af8b · aab7af8b · aab7af8b
Commit aab7af8b authored Jul 09, 2012 by Cédric de Saint Martin
14 changed files
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
 [buildout]
 extends =
-  ../../stack/shacache-client.cfg
+  ../../stack/erp5/buildout.cfg
-  ../../stack/erp5.cfg
-versions = versions
-# Local development
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/cloudooo-repository
-parts +=
-# Local development
-  slapos.cookbook-repository
-  check-recipe
-  slapos.cookbook-python2.6
-  slapos.recipe.template-python2.6
-# Create instance template
-  template
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-# Local development
-[slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
-branch = erp5-component
-revision =
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
-update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-[slapos.cookbook-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.cookbook
-scripts =
-python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
-[slapos.recipe.template-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.recipe.template
-scripts =
-python = python2.6
-[template-jinja2-base]
-recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${buildout:directory}/${:filename}
-# XXX: extra-context is needed because we cannot append to a key of an extended
-# section.
-extra-context =
-context =
-    key bin_directory buildout:bin-directory
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    ${:extra-context}
-[template-mariadb]
-< = template-jinja2-base
-filename = instance-mariadb.cfg
-md5sum = bcaee4e52a4332451b15fb38ecb12a2b
-extra-context =
-    key coreutils_location coreutils:location
-    key dcron_location dcron:location
-    key gettext_location gettext:location
-    key grep_location grep:location
-    key gzip_location gzip:location
-    key logrotate_location logrotate:location
-    key mariadb_location mariadb:location
-    key perl_location perl:location
-    key perl_siteprefix perl:siteprefix
-    key sed_location sed:location
-    key xtrabackup_location xtrabackup:location
-[template-sphinx]
-< = template-jinja2-base
-filename = instance-sphinx.cfg
-md5sum = e3975afd5220f251d6b6e7024a2ca08b
-extra-context =
-    key sphinx_location sphinx:location
-[template-zope]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = ea09a89ca79290c33de0b59a19a5490f 
-mode = 640
-[template-kumofs]
-< = template-jinja2-base
-filename = instance-kumofs.cfg
-md5sum = 700ee7769c89e0959dc3f052e55ada6e
-extra-context =
-    key dash_location dash:location
-    key dcron_location dcron:location
-    key gzip_location gzip:location
-    key kumo_location kumo:location
-    key logrotate_location logrotate:location
-[template-tidstorage]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 520e39f2612a045b42c0ad914bfdc5a9
-mode = 640
-[template-cloudooo]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = d3b3afac9099823ba2853070324a29c8
-mode = 640
-# Additional Configuration
-configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
-[template-zope-conf]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/zope.conf.in
-md5sum = 599e004c18fd3461aa846ae75bd112f2
-mode = 640
-[template]
-< = template-jinja2-base
-# XXX: "template.cfg" is hardcoded in instanciation recipe
-filename = template.cfg
-template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ee7d9040f3f90948fe15f78196f66149
-extra-context =
-    key apache_location apache:location
-    key aspell_location aspell:location
-    key buildout_bin_directory buildout:bin-directory
-    key coreutils_location coreutils:location
-    key dash_location dash:location
-    key dcron_location dcron:location
-    key dmtx_utils_location dmtx-utils:location
-    key erp5_location erp5:location
-    key file_location file:location
-    key fontconfig_location fontconfig:location
-    key fonts_location fonts:location
-    key freetype_location freetype:location
-    key git_location git:location
-    key graphviz_location graphviz:location
-    key grep_location grep:location
-    key gzip_location gzip:location
-    key haproxy_location haproxy:location
-    key imagemagick_location imagemagick:location
-    key libICE_location libICE:location
-    key libSM_location libSM:location
-    key libX11_location libX11:location
-    key libXau_location libXau:location
-    key libXdmcp_location libXdmcp:location
-    key libXext_location libXext:location
-    key libXrender_location libXrender:location
-    key libpng12_location libpng12:location
-    key libreoffice_bin_location libreoffice-bin:location
-    key librsvg_location librsvg:location
-    key libxcb_location libxcb:location
-    key logrotate_location logrotate:location
-    key mariadb_location mariadb:location
-    key openssl_location openssl:location
-    key pdftk_location pdftk:location
-    key poppler_location poppler:location
-    key sed_location sed:location
-    key template_cloudooo template-cloudooo:target
-    key template_erp5_development template-erp5-development:target
-    key template_erp5_production template-erp5-production:rendered
-    key template_kumofs template-kumofs:rendered
-    key template_mariadb template-mariadb:rendered
-    key template_memcached template-memcached:rendered
-    key template_sphinx template-sphinx:rendered
-    key template_tidstorage template-tidstorage:target
-    key template_varnish template-varnish:target
-    key template_zope template-zope:target
-    key template_zope_conf template-zope-conf:target
-    key tesseract_location tesseract:location
-    key varnish_location varnish-3.0:location
-    key w3m_location w3m:location
-    key wget_location wget:location
-    key zlib_location zlib:location
-[template-memcached]
-< = template-jinja2-base
-filename = instance-memcached.cfg
-md5sum = 395779dc578e2527cb0d89c5aee39f65
-extra-context =
-    key dash_location dash:location
-    key memcached_location memcached:location
-[template-erp5-development]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
-md5sum = df405a60901b5c112093d276c5bb1998
-mode = 640
-[template-erp5-production]
-< = template-jinja2-base
-filename = instance-erp5-production.cfg
-md5sum = 3051f3fea39d7409c417dcac26027b56
-extra-context =
-    key local_bt5_repository local-bt5-repository:list
-[template-varnish]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-varnish.cfg.in
-md5sum = 17aee2df57b121343b1fd65f4b51ce80
-mode = 640
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Rafael Monnerat
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN PRIVATE KEY-----
-  MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMc2zhpXKIp9qvjL
-  aedq9ujY5Ys9mqMSF25zgVMg3PzhrZPZ1gObgbU3Ns8Ede7puildGxsr7gQO/F3L
-  1PgCFf+bNKIQQF+8o0SphIQGHBb6L9xMlknYzq6qqOKhUszqyrFUAZcSA6Y0AR+B
-  d5X+nQb+vzPrQk94kr92jmW7BtBPAgMBAAECgYBFzdpiOHAoNuiVzREK2dwysu2b
-  4LYytcAoH6kNK9LDeYCM8iOfl/nXOcWmvHVmhdeJbup0luwL2ARuCWJSlMiH7N9X
-  7XX1yxRWIUbko8M2MxbSp4cexvVI1A8zNvtwkBldO736FU+//G+GYQ/FKul+1640
-  DyRbaRnnfgDhvAAcAQJBAPznTEUX3LcjiB6443kQoPJlx992hH3fV+zDEDV9KwWS
-  u6LKEGFO6Lp8exZzCtCrwpjwFOYtCOHqNkRiGfL4ys8CQQDJpzkF6KpAHPPoKJ+s
-  kpibmVJh3gRt105uysNTMLzsSYOR94/AEdUx/676zS5D8OQRHjq9pJCBSMqRdgI9
-  fQKBAkAD2enZa4Ga8FmUTjB4mX458r7WclGWMR5/poDKr7tF/HQLCJSzRqZYoKin
-  MN1LTDJMbeuDjdAC0LQ+2leW0Z8VAkABJDwzZ1zHXiKXVtuIi4/nmZeYzDv0LzrX
-  b7hpWSZIpCXlhqQ+rxso3EyuSMkRQ2TXH/evKSZURQg4iJV8qZ+BAkEA48lej9PT
-  cw2o9zohoD3iMeVcM3O0tOnP+gCH//++0yKG5V2m08CFtqR6oQeA9HtQjJ7znrW2
-  wmro1zayUIH/+Q==
-  -----END PRIVATE KEY-----
--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg
 [buildout]
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/cloudooo-repository
 extensions =
  slapos.rebootstrap
  slapos.zcbworkarounds
-  buildout-versions
  mr.developer
 find-links =
@@ -12,79 +16,57 @@ find-links =
    http://www.nexedi.org/static/packages/source/
    http://www.owlfish.com/software/wsgiutils/download.html
-# Separate from site eggs
-allowed-eggs-from-site-packages =
-include-site-packages = false
-exec-sitecustomize = false
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-  www.owlfish.com
-  launchpad.net
-  bitbucket.org
 extends =
 # Exact version of Zope
  http://svn.zope.org/repos/main/Zope/tags/2.12.23/versions.cfg
-  ../component/logrotate/buildout.cfg
+  ../../stack/slapos.cfg
-  ../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
-  ../component/file/buildout.cfg
+  ../../component/dcron/buildout.cfg
-  ../component/fonts/buildout.cfg
+  ../../component/file/buildout.cfg
-  ../component/ghostscript/buildout.cfg
+  ../../component/fonts/buildout.cfg
-  ../component/git/buildout.cfg
+  ../../component/ghostscript/buildout.cfg
-  ../component/graphviz/buildout.cfg
+  ../../component/git/buildout.cfg
-  ../component/gzip/buildout.cfg
+  ../../component/graphviz/buildout.cfg
-  ../component/haproxy/buildout.cfg
+  ../../component/gzip/buildout.cfg
-  ../component/hookbox/buildout.cfg
+  ../../component/haproxy/buildout.cfg
-  ../component/librsvg/buildout.cfg
+  ../../component/hookbox/buildout.cfg
-  ../component/imagemagick/buildout.cfg
+  ../../component/librsvg/buildout.cfg
-  ../component/kumo/buildout.cfg
+  ../../component/imagemagick/buildout.cfg
-  ../component/libdmtx/buildout.cfg
+  ../../component/kumo/buildout.cfg
-  ../component/libpng/buildout.cfg
+  ../../component/libdmtx/buildout.cfg
-  ../component/libreoffice-bin/buildout.cfg
+  ../../component/libpng/buildout.cfg
-  ../component/lxml-python/buildout.cfg
+  ../../component/libreoffice-bin/buildout.cfg
-  ../component/percona-toolkit/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
-  ../component/mariadb/buildout.cfg
+  ../../component/percona-toolkit/buildout.cfg
-  ../component/memcached/buildout.cfg
+  ../../component/mariadb/buildout.cfg
-  ../component/mysql-python/buildout.cfg
+  ../../component/memcached/buildout.cfg
-  ../component/pdftk/buildout.cfg
+  ../../component/mysql-python/buildout.cfg
-  ../component/pil-python/buildout.cfg
+  ../../component/pdftk/buildout.cfg
-  ../component/pycrypto-python/buildout.cfg
+  ../../component/pil-python/buildout.cfg
-  ../component/pysvn-python/buildout.cfg
+  ../../component/pycrypto-python/buildout.cfg
-  ../component/python-2.6/buildout.cfg
+  ../../component/pysvn-python/buildout.cfg
-  ../component/python-2.7/buildout.cfg
+  ../../component/python-2.6/buildout.cfg
-  ../component/python-ldap-python/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
-  ../component/rdiff-backup/buildout.cfg
+  ../../component/python-ldap-python/buildout.cfg
-  ../component/sphinx/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
-  ../component/stunnel/buildout.cfg
+  ../../component/sphinx/buildout.cfg
-  ../component/subversion/buildout.cfg
+  ../../component/stunnel/buildout.cfg
-  ../component/tesseract/buildout.cfg
+  ../../component/subversion/buildout.cfg
-  ../component/varnish/buildout.cfg
+  ../../component/tesseract/buildout.cfg
-  ../component/w3-validator/buildout.cfg
+  ../../component/varnish/buildout.cfg
-  ../component/w3m/buildout.cfg
+  ../../component/w3-validator/buildout.cfg
-  ../component/xorg/buildout.cfg
+  ../../component/w3m/buildout.cfg
-  ../component/poppler/buildout.cfg
+  ../../component/xorg/buildout.cfg
-  ../component/xtrabackup/buildout.cfg
+  ../../component/poppler/buildout.cfg
-  ../component/zabbix/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
-  ../component/sed/buildout.cfg
+  ../../component/zabbix/buildout.cfg
-  ../component/coreutils/buildout.cfg
+  ../../component/sed/buildout.cfg
-  ../component/grep/buildout.cfg
+  ../../component/coreutils/buildout.cfg
-  ../component/dash/buildout.cfg
+  ../../component/grep/buildout.cfg
-  ../component/wget/buildout.cfg
+  ../../component/dash/buildout.cfg
-  ../component/aspell/buildout.cfg
+  ../../component/wget/buildout.cfg
-  ../component/cloudooo/buildout.cfg
+  ../../component/aspell/buildout.cfg
+  ../../component/cloudooo/buildout.cfg
-versions = versions
 parts =
  rdiff-backup
@@ -152,6 +134,205 @@ parts =
 # some additional utils
  slapos-toolbox
+# Local development
+  slapos.cookbook-repository
+  check-recipe
+  slapos.cookbook-python2.6
+  slapos.recipe.template-python2.6
+# Create instance template
+  template
+# Local development
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+stop-on-error = true
+branch = erp5-component
+revision =
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+[slapos.cookbook-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.cookbook
+scripts =
+python = python2.6
+ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+[slapos.recipe.template-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.recipe.template
+scripts =
+python = python2.6
+[template-jinja2-base]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+# XXX: extra-context is needed because we cannot append to a key of an extended
+# section.
+extra-context =
+context =
+    key bin_directory buildout:bin-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    ${:extra-context}
+[template-mariadb]
+< = template-jinja2-base
+filename = instance-mariadb.cfg
+md5sum = bcaee4e52a4332451b15fb38ecb12a2b
+extra-context =
+    key coreutils_location coreutils:location
+    key dcron_location dcron:location
+    key gettext_location gettext:location
+    key grep_location grep:location
+    key gzip_location gzip:location
+    key logrotate_location logrotate:location
+    key mariadb_location mariadb:location
+    key perl_location perl:location
+    key perl_siteprefix perl:siteprefix
+    key sed_location sed:location
+    key xtrabackup_location xtrabackup:location
+[template-sphinx]
+< = template-jinja2-base
+filename = instance-sphinx.cfg
+md5sum = e3975afd5220f251d6b6e7024a2ca08b
+extra-context =
+    key sphinx_location sphinx:location
+[template-zope]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-zope.cfg.in
+md5sum = ea09a89ca79290c33de0b59a19a5490f 
+mode = 640
+[template-kumofs]
+< = template-jinja2-base
+filename = instance-kumofs.cfg
+md5sum = 700ee7769c89e0959dc3f052e55ada6e
+extra-context =
+    key dash_location dash:location
+    key dcron_location dcron:location
+    key gzip_location gzip:location
+    key kumo_location kumo:location
+    key logrotate_location logrotate:location
+[template-tidstorage]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
+md5sum = 520e39f2612a045b42c0ad914bfdc5a9
+mode = 640
+[template-cloudooo]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
+md5sum = d3b3afac9099823ba2853070324a29c8
+mode = 640
+# Additional Configuration
+configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
+[template-zope-conf]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/zope.conf.in
+md5sum = 599e004c18fd3461aa846ae75bd112f2
+mode = 640
+[template]
+< = template-jinja2-base
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+filename = template.cfg
+template = ${:_profile_base_location_}/instance.cfg.in
+md5sum = ee7d9040f3f90948fe15f78196f66149
+extra-context =
+    key apache_location apache:location
+    key aspell_location aspell:location
+    key buildout_bin_directory buildout:bin-directory
+    key coreutils_location coreutils:location
+    key dash_location dash:location
+    key dcron_location dcron:location
+    key dmtx_utils_location dmtx-utils:location
+    key erp5_location erp5:location
+    key file_location file:location
+    key fontconfig_location fontconfig:location
+    key fonts_location fonts:location
+    key freetype_location freetype:location
+    key git_location git:location
+    key graphviz_location graphviz:location
+    key grep_location grep:location
+    key gzip_location gzip:location
+    key haproxy_location haproxy:location
+    key imagemagick_location imagemagick:location
+    key libICE_location libICE:location
+    key libSM_location libSM:location
+    key libX11_location libX11:location
+    key libXau_location libXau:location
+    key libXdmcp_location libXdmcp:location
+    key libXext_location libXext:location
+    key libXrender_location libXrender:location
+    key libpng12_location libpng12:location
+    key libreoffice_bin_location libreoffice-bin:location
+    key librsvg_location librsvg:location
+    key libxcb_location libxcb:location
+    key logrotate_location logrotate:location
+    key mariadb_location mariadb:location
+    key openssl_location openssl:location
+    key pdftk_location pdftk:location
+    key poppler_location poppler:location
+    key sed_location sed:location
+    key template_cloudooo template-cloudooo:target
+    key template_erp5_development template-erp5-development:target
+    key template_erp5_production template-erp5-production:rendered
+    key template_kumofs template-kumofs:rendered
+    key template_mariadb template-mariadb:rendered
+    key template_memcached template-memcached:rendered
+    key template_sphinx template-sphinx:rendered
+    key template_tidstorage template-tidstorage:target
+    key template_varnish template-varnish:target
+    key template_zope template-zope:target
+    key template_zope_conf template-zope-conf:target
+    key tesseract_location tesseract:location
+    key varnish_location varnish-3.0:location
+    key w3m_location w3m:location
+    key wget_location wget:location
+    key zlib_location zlib:location
+[template-memcached]
+< = template-jinja2-base
+filename = instance-memcached.cfg
+md5sum = 395779dc578e2527cb0d89c5aee39f65
+extra-context =
+    key dash_location dash:location
+    key memcached_location memcached:location
+[template-erp5-development]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
+md5sum = df405a60901b5c112093d276c5bb1998
+mode = 640
+[template-erp5-production]
+< = template-jinja2-base
+filename = instance-erp5-production.cfg
+md5sum = 3051f3fea39d7409c417dcac26027b56
+extra-context =
+    key local_bt5_repository local-bt5-repository:list
+[template-varnish]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-varnish.cfg.in
+md5sum = 17aee2df57b121343b1fd65f4b51ce80
+mode = 640
 [bt5-repository]
 # Format:
 #   <url or path> [...]
@@ -382,9 +563,6 @@ scripts =
  zodbpack
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-006
 # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
 Acquisition = 2.13.7nxd001
 Products.DCWorkflow = 2.2.3nxd002
@@ -457,9 +635,6 @@ fpconst = 0.7.2
 gitdb = 0.5.4
 greenlet = 0.3.4
 hexagonit.recipe.cmmi = 1.5.0
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-001
 http-parser = 0.7.5
 huBarcode = 0.63
 inotifyx = 0.2.0

--- a/software/erp5/instance-cloudoo.cfg.in
+++ b/software/erp5/instance-cloudoo.cfg.in
--- a/software/erp5/instance-erp5-development.cfg.in
+++ b/software/erp5/instance-erp5-development.cfg.in
--- a/software/erp5/instance-erp5-production.cfg.in
+++ b/software/erp5/instance-erp5-production.cfg.in
--- a/software/erp5/instance-kumofs.cfg.in
+++ b/software/erp5/instance-kumofs.cfg.in
--- a/software/erp5/instance-mariadb.cfg.in
+++ b/software/erp5/instance-mariadb.cfg.in
--- a/software/erp5/instance-memcached.cfg.in
+++ b/software/erp5/instance-memcached.cfg.in
--- a/software/erp5/instance-sphinx.cfg.in
+++ b/software/erp5/instance-sphinx.cfg.in
--- a/software/erp5/instance-tidstorage.cfg.in
+++ b/software/erp5/instance-tidstorage.cfg.in
--- a/software/erp5/instance-varnish.cfg.in
+++ b/software/erp5/instance-varnish.cfg.in
--- a/software/erp5/instance-zope.cfg.in
+++ b/software/erp5/instance-zope.cfg.in
--- a/software/erp5/instance.cfg.in
+++ b/software/erp5/instance.cfg.in
--- a/software/erp5/zope.conf.in
+++ b/software/erp5/zope.conf.in