Merge branch 'master' into slapos

50e8fc75 · Łukasz Nowak · df70917d · ff5c054a · 50e8fc75 · 50e8fc75
Commit 50e8fc75 authored Nov 24, 2011 by Łukasz Nowak
84 changed files
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======
-0.34 (Unreleased)
+0.36 (2011-11-16)
 -----------------
-  * No change yet.
+ * erp5testnode : the code of testnode is not in slapos repository anymore
+0.35 (2011-11-10)
+-----------------
+ * KVM : Promise are now working properly. [Łukasz Nowak]
+ * KVM : Use NoVNC with automatic login. [Cedric de Saint Martin]
+ * KVM : Use websockify egg and remove numpy hack. [Cedric de Saint Martin]
+0.34 (2011-11-08)
+-----------------
+  * Any LAMP software can specify its own php.ini [Alain Takoudjou]
+  * LAMP : Fix bug where buildout does not has sufficient rights to update
+    application parts. [Alain Takoudjou]
+  * LAMP : Update formatting when returning list of renamed files.
+    [Alain Takoudjou]
 0.33 (2011-10-31)
 -----------------

--- a/component/cclient/buildout.cfg
+++ b/component/cclient/buildout.cfg
@@ -12,16 +12,15 @@ parts =
 [cclient-patch]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/imap-2007f.patch
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = 42c77fdd5d7a976fc302b93aadb3da98
-download-only = True
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = imap-2007f.patch
 [cclient]
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true
-keep-compile-dir = true
 # cclient does not support parallel compilation
 make-options = 
  slx

--- a/component/cclient/imap-2007f.patch
+++ b/component/cclient/imap-2007f.patch
 --- old/Makefile	2011-09-22 13:19:53.000000000 +0100
-+++ new/Makefile	2011-09-23 11:29:12.405271442 +0100
+++ new/Makefile	2011-11-09 15:02:54.038306922 +0100
-@@ -580,7 +580,6 @@
+@@ -280,7 +280,11 @@
+ SYSTEM=unix
+ TOOLS=tools
+ TOUCH=touch
+-
+IMAPDIR=$(CCLIENT)/cclient
+COMPILEDIR = $(CCLIENT)/cclient__compile__/imap-2007f
+CP=cp -r
+INSTALL=install
+FOR=for
+ # Primary build command
+@@ -580,7 +584,6 @@
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	@echo
 	@echo Do you want to continue this build anyway?  Type y or n please:
@@ -8,7 +21,7 @@
 nounenc:
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -639,7 +638,7 @@
+@@ -639,7 +642,7 @@
 	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	@echo
 	@echo Do you want to build with IPv6 anyway?  Type y or n please:
@@ -17,15 +30,27 @@
 	@echo OK, I will remember that you really want to build with IPv6.
 	@echo You will not see this message again.
 	@$(TOUCH) ip6
-@@ -731,6 +730,12 @@
+@@ -731,6 +734,24 @@
 	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
 	$(CD) tools;$(MAKE) clean
-+install:
+install:	
-+	install -v -d $(CCLIENT)/cclient/include
+	$(INSTALL) -v -d $(IMAPDIR)/include
-+	ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client $(CCLIENT)/cclient/include
+	$(INSTALL) -v -d $(IMAPDIR)/lib
-+	install -v -d $(CCLIENT)/cclient/lib
+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/*.h $(IMAPDIR)/include
-+	ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client/c-client.a $(CCLIENT)/cclient/lib/libc-client.a
+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/c-client.a $(IMAPDIR)/lib
+	$(CP) $(COMPILEDIR)/ipopd $(COMPILEDIR)/mailutil $(COMPILEDIR)/imapd \
+	$(COMPILEDIR)/dmail $(COMPILEDIR)/mlock $(COMPILEDIR)/mtest $(COMPILEDIR)/tmail $(IMAPDIR)
+	$(RM) $(IMAPDIR)/ipopd/*.h $(IMAPDIR)/ipopd/*.c $(IMAPDIR)/ipopd/Makefile;
+	$(RM) $(IMAPDIR)/mailutil/*.h $(IMAPDIR)/mailutil/*.c $(IMAPDIR)/mailutil/Makefile;
+	$(RM) $(IMAPDIR)/imapd/*.h $(IMAPDIR)/imapd/*.c $(IMAPDIR)/imapd/Makefile;
+	$(RM) $(IMAPDIR)/tmail/*.h $(IMAPDIR)/tmail/*.c $(IMAPDIR)/tmail/Makefile;
+	$(RM) $(IMAPDIR)/mlock/*.h $(IMAPDIR)/mlock/*.c $(IMAPDIR)/mlock/Makefile;
+	$(RM) $(IMAPDIR)/mtest/*.h $(IMAPDIR)/mtest/*.c $(IMAPDIR)/mtest/Makefile;
+	$(RM) $(IMAPDIR)/dmail/*.h $(IMAPDIR)/dmail/*.c $(IMAPDIR)/dmail/Makefile;
+	$(INSTALL) -v -m 644 $(COMPILEDIR)/ip6 $(IMAPDIR)
+	$(INSTALL) -v -m 644 $(COMPILEDIR)/OSTYPE $(IMAPDIR)
+	$(INSTALL) -v -m 644 $(COMPILEDIR)/SPECIALS $(IMAPDIR)
 +
 # A monument to a hack of long ago and far away...

--- a/stack/kvm.cfg
+++ b/stack/kvm.cfg
 [buildout]
-extends =
+extends = 
-  shacache-client.cfg
+  ../readline/buildout.cfg
-  ../component/python-2.7/buildout.cfg
+  ../ncurses/buildout.cfg
-  ../component/lxml-python/buildout.cfg
+  ../zlib/buildout.cfg
-  ../component/git/buildout.cfg
-  ../component/zlib/buildout.cfg
-  ../component/readline/buildout.cfg
-  ../component/ncurses/buildout.cfg
-  ../component/libuuid/buildout.cfg
-  ../component/noVNC/buildout.cfg
-  ../component/openssl/buildout.cfg
-  ../component/rdiff-backup/buildout.cfg
-  ../component/dcron/buildout.cfg
-  ../component/libpng/buildout.cfg
-#XXX-Cedric : Currently, one can only access to KVM using noVNC.
+parts = gnutls
-#             Ideally one should be able to access KVM by using either NoVNC or VNC.
-#             Problem is : no native crypto support in web browsers. So we have to disable ssl
-#             In qemu builtin vnc server, and make it available only for localhost 
-#             so that only novnc can listen to it.
-#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
-#            When qemu has builtin support for websockets in vnc server to get rid of 
-#            Websockify (socket <-> websocket proxy server) when it is ready.
-#            May solve previous XXX depending on the implementation.
-parts =
-  template
-  gnutls
-  kvm
-  eggs
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-versions = versions
 [gpg-error]
 recipe = hexagonit.recipe.cmmi
@@ -52,6 +22,7 @@ environment =
  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
 [gnutls]
+# XXX-Cedric : update to latest gnutls
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
@@ -61,44 +32,3 @@ environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
  PKG_CONFIG=${zlib:location}/lib/pkgconfig
-[kvm]
-recipe = hexagonit.recipe.cmmi
-path = ${kvmsource:location}/
-configure-options =
-  --disable-sdl
-  --disable-xen
-  --enable-vnc-tls
-  --disable-vnc-sasl
-  --disable-curses
-  --disable-curl
-  --enable-kvm
-  --disable-docs
-  --enable-vnc-png
-  --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
-  --disable-werror
-environment =
-  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig
-[kvmsource]
-recipe=plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-#tag = slapos-v0.1
-command =
-  (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
-update-command =
- cd ${:location} && ${git:location}/bin/git pull --quiet origin master
-[eggs]
-python = python2.7
-recipe = z3c.recipe.scripts
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  numpy
-[versions]
-zc.buildout = 1.5.3-dev-SlapOS-009
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
-version = '0.34-dev'
+version = '0.36'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"

--- a/slapos/recipe/README.lamp.txt
+++ b/slapos/recipe/README.lamp.txt
 lamp
 =====
-the lamp recipe help you to deploy simply a php based application on slapos. This recipe is 
+The lamp recipe helps you to deploy simply a php based application on slapos. This recipe is 
-able to setup mariadb, apache and apache-php for your php application, is also capable to
+able to setup mariadb, apache and apache-php for your php application, and is also capable of
-configure your software during installation to ensure a full compatibility.
+configuring your software during installation to ensure a full compatibility.
 How to use?
@@ -34,9 +34,26 @@ in this case you need to write a python script and lamp recipe must run it when
 How to use?
 -----------
+this part of lamp recipe work with slapos.toolbox, Therefore you must add it to your recipe.
+in software.cfg, replace instance-recipe-egg part by
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]
+and add into your instance.cfg
+lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 CONDITION
 --------
-the action (move, rename, launch script) only starts when the condition is filled.
+the action (delete, rename, script, chmod) only starts when the condition is filled.
 in instance.cfg, add 
 file_token = path_of_file
@@ -52,14 +69,13 @@ into mariadb databse for example table_name = admin. if you use
 name_of_table = **, the action will begin when database is ready. 
 constraint is the sql_condition to use when search entry into name_of_table for example constraint = `admin_id`=1
-you can no use file_token and table_name at the same time, otherwise file_token will be used in priority. attention 
+you can't use file_token and table_name at the same time, otherwise file_token will be used in priority. Beware of conditions that will never be satisfied.
-to the conditions that will never be satisfied.
 ACTION
 -------
-the action start when condition is true
+The action starts when condition is true
 1- delete file or folder
 into instance.cfg, use 
@@ -70,13 +86,23 @@ for example delete = admin
 2- rename file or folder
 into instance.cfg, use 
-rename = old_name1 => new_name1, old_name2 => new_name2, ... you can also use
+rename_chmod = mode (optional)
+rename = old_name1 => new_name1, old_name2 => new_name2, ... 
+you can also use
 rename = old_name1, old_name2 => new_name2, ... in this case old_name1 will be rename and the new name will be chose
 by joining old_name1 and mysql_user: this should give 
 rename = old_name1 => old_name1-mysql_user, old_name2 => new_name2, ...
+use rename_chmod to apply a mode to new_name1, new_name2, ...
+3- Change mode of file or directory
+this is usefull if you want to change the mode of files into your www-data, use 
+chmod = file1, file2, ....
+mode = mode_to_apply (ex= 0644)
-3- launch python script
+4- Launch python script
 use script = ${configure-script:location}/${configure-script:filename} into instance.cfg, add part configure-script
 into software.cfg
@@ -90,10 +116,10 @@ url = url_of_script_name.py
 filename = script_name.py
 download-only = True
-the script_name.py should contain a main module, sys.argv is passed to the main. you can write script_name.py like this
+The script_name.py should contain a main function, sys.argv is given to the main. you can write script_name.py like this
 ....
 def setup(args):
-    base_url, htdocs, renamed, mysql_user, mysql_password, mysql_database, mysql_host = args
+    mysql_port, mysql_host, mysql_user, mysql_password, mysql_database, base_url, htdocs = args
    .......
 if __name__ == '__main__':
@@ -102,3 +128,4 @@ if __name__ == '__main__':
 base_url: is the url of php software
 htdocs: is the path of www-data directory
 mysql_user, mysql_password, mysql_database, mysql_host: is the mariadb parameters
+you can also use "import MySQLdb" if you want to access to database via your python script
\ No newline at end of file
--- a/slapos/recipe/erp5testnode/SlapOSControler.py
+++ b/slapos/recipe/erp5testnode/SlapOSControler.py
-import slapos.slap, subprocess, os, time
-from xml_marshaller import xml_marshaller
-class SlapOSControler(object):
-  def __init__(self, config, process_group_pid_set=None):
-    self.config = config
-    # By erasing everything, we make sure that we are able to "update"
-    # existing profiles. This is quite dirty way to do updates...
-    if os.path.exists(config['proxy_database']):
-      os.unlink(config['proxy_database'])
-    proxy = subprocess.Popen([config['slapproxy_binary'],
-      config['slapos_config']], close_fds=True, preexec_fn=os.setsid)
-    process_group_pid_set.add(proxy.pid)
-    # XXX: dirty, giving some time for proxy to being able to accept
-    # connections
-    time.sleep(10)
-    slap = slapos.slap.slap()
-    slap.initializeConnection(config['master_url'])
-    # register software profile
-    self.software_profile = config['custom_profile_path']
-    slap.registerSupply().supply(
-        self.software_profile,
-        computer_guid=config['computer_id'])
-    computer = slap.registerComputer(config['computer_id'])
-    # create partition and configure computer
-    partition_reference = config['partition_reference']
-    partition_path = os.path.join(config['instance_root'], partition_reference)
-    if not os.path.exists(partition_path):
-      os.mkdir(partition_path)
-      os.chmod(partition_path, 0750)
-    computer.updateConfiguration(xml_marshaller.dumps({
- 'address': config['ipv4_address'],
- 'instance_root': config['instance_root'],
- 'netmask': '255.255.255.255',
- 'partition_list': [{'address_list': [{'addr': config['ipv4_address'],
-                                       'netmask': '255.255.255.255'},
-                                      {'addr': config['ipv6_address'],
-                                       'netmask': 'ffff:ffff:ffff::'},
-                      ],
-                     'path': partition_path,
-                     'reference': partition_reference,
-                     'tap': {'name': partition_reference},
-                     }
-                    ],
- 'reference': config['computer_id'],
- 'software_root': config['software_root']}))
-  def runSoftwareRelease(self, config, environment, process_group_pid_set=None,
-                         stdout=None, stderr=None):
-    print "SlapOSControler.runSoftwareRelease"
-    cpu_count = os.sysconf("SC_NPROCESSORS_ONLN")
-    os.putenv('MAKEFLAGS', '-j%s' % cpu_count)
-    os.environ['PATH'] = environment['PATH']
-    slapgrid = subprocess.Popen([config['slapgrid_software_binary'], '-v', '-c',
-      #'--buildout-parameter',"'-U -N' -o",
-      config['slapos_config']],
-      stdout=stdout, stderr=stderr,
-      close_fds=True, preexec_fn=os.setsid)
-    process_group_pid_set.add(slapgrid.pid)
-    slapgrid.wait()
-    stdout.seek(0)
-    stderr.seek(0)
-    process_group_pid_set.remove(slapgrid.pid)
-    status_dict = {'status_code':slapgrid.returncode,
-                    'stdout':stdout.read(),
-                    'stderr':stderr.read()}
-    stdout.close()
-    stderr.close()
-    return status_dict
-  def runComputerPartition(self, config, environment,
-                           process_group_pid_set=None,
-                           stdout=None, stderr=None):
-    print "SlapOSControler.runSoftwareRelease"
-    slap = slapos.slap.slap()
-    slap.registerOpenOrder().request(self.software_profile,
-        partition_reference='testing partition',
-        partition_parameter_kw=config['instance_dict'])
-    slapgrid = subprocess.Popen([config['slapgrid_partition_binary'],
-      config['slapos_config'], '-c', '-v'],
-      stdout=stdout, stderr=stderr,
-      close_fds=True, preexec_fn=os.setsid)
-    process_group_pid_set.add(slapgrid.pid)
-    slapgrid.wait()
-    stdout.seek(0)
-    stderr.seek(0)
-    process_group_pid_set.remove(slapgrid.pid)
-    status_dict = {'status_code':slapgrid.returncode,
-                    'stdout':stdout.read(),
-                    'stderr':stderr.read()}
-    stdout.close()
-    stderr.close()
-    return status_dict
--- a/slapos/recipe/erp5testnode/Updater.py
+++ b/slapos/recipe/erp5testnode/Updater.py
-import os, sys, subprocess, re, threading
-from testnode import SubprocessError
-_format_command_search = re.compile("[[\\s $({?*\\`#~';<>&|]").search
-_format_command_escape = lambda s: "'%s'" % r"'\''".join(s.split("'"))
-def format_command(*args, **kw):
-  cmdline = []
-  for k, v in sorted(kw.items()):
-    if _format_command_search(v):
-      v = _format_command_escape(v)
-    cmdline.append('%s=%s' % (k, v))
-  for v in args:
-    if _format_command_search(v):
-      v = _format_command_escape(v)
-    cmdline.append(v)
-  return ' '.join(cmdline)
-def subprocess_capture(p, quiet=False):
-  def readerthread(input, output, buffer):
-    while True:
-      data = input.readline()
-      if not data:
-        break
-      output(data)
-      buffer.append(data)
-  if p.stdout:
-    stdout = []
-    output = quiet and (lambda data: None) or sys.stdout.write
-    stdout_thread = threading.Thread(target=readerthread,
-                                     args=(p.stdout, output, stdout))
-    stdout_thread.setDaemon(True)
-    stdout_thread.start()
-  if p.stderr:
-    stderr = []
-    stderr_thread = threading.Thread(target=readerthread,
-                                     args=(p.stderr, sys.stderr.write, stderr))
-    stderr_thread.setDaemon(True)
-    stderr_thread.start()
-  if p.stdout:
-    stdout_thread.join()
-  if p.stderr:
-    stderr_thread.join()
-  p.wait()
-  return (p.stdout and ''.join(stdout),
-          p.stderr and ''.join(stderr))
-GIT_TYPE = 'git'
-SVN_TYPE = 'svn'
-class Updater(object):
-  _git_cache = {}
-  realtime_output = True
-  stdin = file(os.devnull)
-  def __init__(self, repository_path, revision=None, git_binary=None):
-    self.revision = revision
-    self._path_list = []
-    self.repository_path = repository_path
-    self.git_binary = git_binary
-  def getRepositoryPath(self):
-    return self.repository_path
-  def getRepositoryType(self):
-    try:
-      return self.repository_type
-    except AttributeError:
-      # guess the type of repository we have
-      if os.path.isdir(os.path.join(
-                       self.getRepositoryPath(), '.git')):
-        repository_type = GIT_TYPE
-      elif os.path.isdir(os.path.join(
-                       self.getRepositoryPath(), '.svn')):
-        repository_type = SVN_TYPE
-      else:
-        raise NotImplementedError
-      self.repository_type = repository_type
-      return repository_type
-  def deletePycFiles(self, path):
-    """Delete *.pyc files so that deleted/moved files can not be imported"""
-    for path, dir_list, file_list in os.walk(path):
-      for file in file_list:
-        if file[-4:] in ('.pyc', '.pyo'):
-          # allow several processes clean the same folder at the same time
-          try:
-            os.remove(os.path.join(path, file))
-          except OSError, e:
-            if e.errno != errno.ENOENT:
-              raise
-  def spawn(self, *args, **kw):
-    quiet = kw.pop('quiet', False)
-    env = kw and dict(os.environ, **kw) or None
-    command = format_command(*args, **kw)
-    print '\n$ ' + command
-    sys.stdout.flush()
-    p = subprocess.Popen(args, stdin=self.stdin, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE, env=env,
-                         cwd=self.getRepositoryPath())
-    if self.realtime_output:
-      stdout, stderr = subprocess_capture(p, quiet)
-    else:
-      stdout, stderr = p.communicate()
-      if not quiet:
-        sys.stdout.write(stdout)
-      sys.stderr.write(stderr)
-    result = dict(status_code=p.returncode, command=command,
-                  stdout=stdout, stderr=stderr)
-    if p.returncode:
-      raise SubprocessError(result)
-    return result
-  def _git(self, *args, **kw):
-    return self.spawn(self.git_binary, *args, **kw)['stdout'].strip()
-  def _git_find_rev(self, ref):
-    try:
-      return self._git_cache[ref]
-    except KeyError:
-      if os.path.exists('.git/svn'):
-        r = self._git('svn', 'find-rev', ref)
-        assert r
-        self._git_cache[ref[0] != 'r' and 'r%u' % int(r) or r] = ref
-      else:
-        r = self._git('rev-list', '--topo-order', '--count', ref), ref
-      self._git_cache[ref] = r
-      return r
-  def getRevision(self, *path_list):
-    if not path_list:
-      path_list = self._path_list
-    if self.getRepositoryType() == GIT_TYPE:
-      h = self._git('log', '-1', '--format=%H', '--', *path_list)
-      return self._git_find_rev(h)
-    elif self.getRepositoryType() == SVN_TYPE:
-      stdout = self.spawn('svn', 'info', *path_list)['stdout']
-      return str(max(map(int, SVN_CHANGED_REV.findall(stdout))))
-    raise NotImplementedError
-  def checkout(self, *path_list):
-    if not path_list:
-      path_list = '.',
-    revision = self.revision
-    if self.getRepositoryType() == GIT_TYPE:
-      # edit .git/info/sparse-checkout if you want sparse checkout
-      if revision:
-        if type(revision) is str:
-          h = revision
-        else:
-          h = revision[1]
-        if h != self._git('rev-parse', 'HEAD'):
-          self.deletePycFiles('.')
-          self._git('reset', '--merge', h)
-      else:
-        self.deletePycFiles('.')
-        if os.path.exists('.git/svn'):
-          self._git('svn', 'rebase')
-        else:
-          self._git('pull', '--ff-only')
-        self.revision = self._git_find_rev(self._git('rev-parse', 'HEAD'))
-    elif self.getRepositoryType() == SVN_TYPE:
-      # following code allows sparse checkout
-      def svn_mkdirs(path):
-        path = os.path.dirname(path)
-        if path and not os.path.isdir(path):
-          svn_mkdirs(path)
-          self.spawn(*(args + ['--depth=empty', path]))
-      for path in path_list:
-        args = ['svn', 'up', '--force', '--non-interactive']
-        if revision:
-          args.append('-r%s' % revision)
-        svn_mkdirs(path)
-        args += '--set-depth=infinity', path
-        self.deletePycFiles(path)
-        try:
-          status_dict = self.spawn(*args)
-        except SubprocessError, e:
-          if 'cleanup' not in e.stderr:
-            raise
-          self.spawn('svn', 'cleanup', path)
-          status_dict = self.spawn(*args)
-        if not revision:
-          self.revision = revision = SVN_UP_REV.findall(
-            status_dict['stdout'].splitlines()[-1])[0]
-    else:
-      raise NotImplementedError
-    self._path_list += path_list
--- a/slapos/recipe/erp5testnode/__init__.py
+++ b/slapos/recipe/erp5testnode/__init__.py
@@ -31,129 +31,79 @@ import zc.buildout
 import zc.recipe.egg
 import sys
-CONFIG = dict(
-  proxy_port='5000',
-  computer_id='COMPUTER',
-  partition_reference='test0',
-)
 class Recipe(BaseSlapRecipe):
  def __init__(self, buildout, name, options):
    self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
    BaseSlapRecipe.__init__(self, buildout, name, options)
-  def installSlapOs(self):
+  def _install(self):
+    self.requirements, self.ws = self.egg.working_set()
+    path_list = []
+    CONFIG = dict()
    CONFIG['slapos_directory'] = self.createDataDirectory('slapos')
    CONFIG['working_directory'] = self.createDataDirectory('testnode')
-    CONFIG['software_root'] = os.path.join(CONFIG['slapos_directory'],
+    CONFIG['test_suite_directory'] = self.createDataDirectory('test_suite')
-        'software')
-    CONFIG['instance_root'] = os.path.join(CONFIG['slapos_directory'],
-        'instance')
-    CONFIG['proxy_database'] = os.path.join(CONFIG['slapos_directory'],
-        'proxy.db')
    CONFIG['proxy_host'] = self.getLocalIPv4Address()
-    CONFIG['master_url'] = 'http://%s:%s' % (CONFIG['proxy_host'],
+    CONFIG['proxy_port'] = '5000'
-        CONFIG['proxy_port'])
+    CONFIG['log_directory'] = self.createDataDirectory('testnodelog')
-    self._createDirectory(CONFIG['software_root'])
+    CONFIG['run_directory'] = self.createDataDirectory('testnoderun')
-    self._createDirectory(CONFIG['instance_root'])
+    CONFIG['test_suite_title'] = self.parameter_dict.get('test_suite_title')
-    CONFIG['slapos_config'] = self.createConfigurationFile('slapos.cfg',
+    CONFIG['test_node_title'] = self.parameter_dict.get('test_node_title')
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+    CONFIG['test_suite'] = self.parameter_dict.get('test_suite')
-          'template/slapos.cfg.in'), CONFIG))
+    CONFIG['node_quantity'] = self.parameter_dict.get('node_quantity', '1')
-    self.path_list.append(CONFIG['slapos_config'])
+    CONFIG['project_title'] = self.parameter_dict.get('project_title')
+    CONFIG['ipv4_address'] = self.getLocalIPv4Address()
-  def setupRunningWrapper(self):
+    CONFIG['ipv6_address'] = self.getGlobalIPv6Address()
-    self.path_list.extend(zc.buildout.easy_install.scripts([(
+    CONFIG['test_suite_master_url'] = self.parameter_dict.get(
-      'testnode',
+                                'test_suite_master_url', None)
-        __name__+'.testnode', 'run')], self.ws,
+    CONFIG['git_binary'] = self.options['git_binary']
-          sys.executable, self.wrapper_directory, arguments=[
+    CONFIG['slapgrid_partition_binary'] = self.options[
-            dict(
+      'slapgrid_partition_binary']
-              computer_id=CONFIG['computer_id'],
+    CONFIG['slapgrid_software_binary'] = self.options[
-              instance_dict=eval(self.parameter_dict.get('instance_dict', '{}')),
+      'slapgrid_software_binary']
-              instance_root=CONFIG['instance_root'],
+    CONFIG['slapproxy_binary'] = self.options['slapproxy_binary']
-              ipv4_address=self.getLocalIPv4Address(),
+    CONFIG['zip_binary'] = self.options['zip_binary']
-              ipv6_address=self.getGlobalIPv6Address(),
+    CONFIG['PATH'] = os.environ['PATH']
-              master_url=CONFIG['master_url'],
+    additional_bt5_repository_id = \
-              profile_path=self.parameter_dict['profile_path'],
+        self.parameter_dict.get('additional_bt5_repository_id')
-              proxy_database=CONFIG['proxy_database'],
-              proxy_port=CONFIG['proxy_port'],
-              slapgrid_partition_binary=self.options['slapgrid_partition_binary'],
-              slapgrid_software_binary=self.options['slapgrid_software_binary'],
-              slapos_config=CONFIG['slapos_config'],
-              slapproxy_binary=self.options['slapproxy_binary'],
-              git_binary=self.options['git_binary'],
-              software_root=CONFIG['software_root'],
-              working_directory=CONFIG['working_directory'],
-              vcs_repository_list=eval(self.parameter_dict.get('vcs_repository_list'),),
-              node_quantity=self.parameter_dict.get('node_quantity', '1'),
-              test_suite_master_url=self.parameter_dict.get(
-                                'test_suite_master_url', None),
-              test_suite=self.parameter_dict.get('test_suite'),
-              test_suite_title=self.parameter_dict.get('test_suite_title'),
-              test_node_title=self.parameter_dict.get('test_node_title'),
-              project_title=self.parameter_dict.get('project_title'),
-              bin_directory=self.bin_directory,
-              # botenvironemnt is splittable string of key=value to substitute
-              # environment of running bot
-              bot_environment=self.parameter_dict.get('bot_environment', ''),
-              partition_reference=CONFIG['partition_reference'],
-              environment=dict(PATH=os.environ['PATH']),
-              vcs_authentication_list=eval(self.parameter_dict.get(
-                     'vcs_authentication_list', 'None')),
-            )
-          ]))
-  def installLocalGit(self):
-    git_dict = dict(git_binary = self.options['git_binary'])
-    git_dict.update(self.parameter_dict)
-    double_slash_end_position = 1
-    # XXX, this should be provided by slapos
-    print "bin_directory : %r" % self.bin_directory
-    home_directory = os.path.join(*os.path.split(self.bin_directory)[0:-1])
-    print "home_directory : %r" % home_directory
-    git_dict.setdefault("git_server_name", "git.erp5.org")
-    if git_dict.get('vcs_authentication_list', None) is not None:
-      vcs_authentication_list = eval(git_dict['vcs_authentication_list'])
-      netrc_file = open(os.path.join(home_directory, '.netrc'), 'w')
-      for vcs_authentication_dict in vcs_authentication_list:
-        netrc_file.write("""
-machine %(host)s
-login %(user_name)s
-password %(password)s
-""" % vcs_authentication_dict)
-      netrc_file.close()
-  def installLocalRepository(self):
+    CONFIG['bt5_path'] = None
-    self.installLocalGit()
+    if additional_bt5_repository_id is not None:
+      CONFIG['bt5_path'] = ""
+      additional_bt5_repository_id_list = additional_bt5_repository_id.split(",")
+      for id in additional_bt5_repository_id_list:
+        id_path = os.path.join(CONFIG['slapos_directory'], id)
+        bt_path = os.path.join(id_path, "bt5")
+        CONFIG['bt5_path'] += "%s,%s," % (id_path, bt_path)
+    CONFIG['instance_dict'] = ''
+    if 'instance_dict' in self.parameter_dict:
+      CONFIG['instance_dict'] = '[instance_dict]\n'
+      for k,v in eval(self.parameter_dict['instance_dict']).iteritems():
+        CONFIG['instance_dict'] += '%s = %s\n' % (k,v)
-  def installLocalZip(self):
+    CONFIG['repository_list'] = ''
-    zip = os.path.join(self.bin_directory, 'zip')
+    i = 0
-    if os.path.lexists(zip):
+    for repository in eval(self.parameter_dict['vcs_repository_list']):
-      os.unlink(zip)
+      CONFIG['repository_list'] += '[vcs_repository_%s]\n' % i
-    os.symlink(self.options['zip_binary'], zip)
+      CONFIG['repository_list'] += 'url = %s\n' % repository['url']
+      if 'branch' in repository:
-  def installLocalPython(self):
+        CONFIG['repository_list'] += 'branch = %s\n' % repository['branch']
-    """Installs local python fully featured with eggs"""
+      if 'profile_path' in repository:
-    self.path_list.extend(zc.buildout.easy_install.scripts([], self.ws,
+        CONFIG['repository_list'] += 'profile_path = %s\n' % repository[
-          sys.executable, self.bin_directory, scripts=None,
+          'profile_path']
-          interpreter='python'))
+      if 'buildout_section_id' in repository:
+        CONFIG['repository_list'] += 'buildout_section_id = %s\n' % repository[
-  def installLocalRunUnitTest(self):
+          'buildout_section_id']
-    link = os.path.join(self.bin_directory, 'runUnitTest')
+      CONFIG['repository_list'] += '\n'
-    destination = os.path.join(CONFIG['instance_root'],
+      i += 1
-        CONFIG['partition_reference'], 'bin', 'runUnitTest')
+    testnode_config = self.createConfigurationFile('erp5testnode.cfg',
-    if os.path.lexists(link):
+        self.substituteTemplate(pkg_resources.resource_filename(__name__,
-      if not os.readlink(link) != destination:
+          'template/erp5testnode.cfg.in'), CONFIG))
-        os.unlink(link)
+    testnode_log = os.path.join(self.log_directory, 'erp5testnode.log')
-    if not os.path.lexists(link):
+    wrapper = zc.buildout.easy_install.scripts([('erp5testnode',
-      os.symlink(destination, link)
+     'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[[self.options['testnode'], '-l',
-  def _install(self):
+      testnode_log, testnode_config], {'GIT_SSL_NO_VERIFY': '1'}])[0]
-    self.requirements, self.ws = self.egg.working_set()
+    path_list.append(testnode_config)
-    self.path_list = []
+    path_list.append(wrapper)
-    self.installSlapOs()
+    return path_list
-    self.setupRunningWrapper()
-    self.installLocalRepository()
-    self.installLocalZip()
-    self.installLocalPython()
-    self.installLocalRunUnitTest()
-    return self.path_list
--- a/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
+++ b/slapos/recipe/erp5testnode/template/erp5testnode.cfg.in
+[testnode]
+slapos_directory = %(slapos_directory)s
+working_directory = %(slapos_directory)s
+test_suite_directory = %(test_suite_directory)s
+log_directory = %(log_directory)s
+run_directory = %(run_directory)s
+proxy_host = %(proxy_host)s
+proxy_port = %(proxy_port)s
+test_suite_title = %(test_suite_title)s
+test_suite = %(test_suite)s
+node_quantity = %(node_quantity)s
+test_node_title = %(test_node_title)s
+project_title= %(project_title)s
+ipv4_address = %(ipv4_address)s
+ipv6_address = %(ipv6_address)s
+test_suite_master_url = %(test_suite_master_url)s
+bt5_path = %(bt5_path)s
+# Binaries
+git_binary = %(git_binary)s
+slapgrid_partition_binary = %(slapgrid_partition_binary)s
+slapgrid_software_binary = %(slapgrid_software_binary)s
+slapproxy_binary = %(slapproxy_binary)s
+zip_binary = %(zip_binary)s
+[environment]
+PATH = %(PATH)s
+%(instance_dict)s
+%(repository_list)s
--- a/slapos/recipe/erp5testnode/template/slapos.cfg.in
+++ b/slapos/recipe/erp5testnode/template/slapos.cfg.in
-[slapos]
-software_root = %(software_root)s
-instance_root = %(instance_root)s
-master_url = %(master_url)s
-computer_id = %(computer_id)s
-[slapproxy]
-host = %(proxy_host)s
-port = %(proxy_port)s
-database_uri = %(proxy_database)s
--- a/slapos/recipe/erp5testnode/testnode.py
+++ b/slapos/recipe/erp5testnode/testnode.py
-from xml_marshaller import xml_marshaller
-import os, xmlrpclib, time, imp
-from glob import glob
-import signal
-import slapos.slap
-import subprocess
-import sys
-import socket
-import pprint
-from SlapOSControler import SlapOSControler
-class SubprocessError(EnvironmentError):
-  def __init__(self, status_dict):
-    self.status_dict = status_dict
-  def __getattr__(self, name):
-    return self.status_dict[name]
-  def __str__(self):
-    return 'Error %i' % self.status_code
-from Updater import Updater
-process_group_pid_set = set()
-process_pid_file_list = []
-process_command_list = []
-def sigterm_handler(signal, frame):
-  for pgpid in process_group_pid_set:
-    try:
-      os.killpg(pgpid, signal.SIGTERM)
-    except:
-      pass
-  for pid_file in process_pid_file_list:
-    try:
-      os.kill(int(open(pid_file).read().strip()), signal.SIGTERM)
-    except:
-      pass
-  for p in process_command_list:
-    try:
-      subprocess.call(p)
-    except:
-      pass
-  sys.exit(1)
-signal.signal(signal.SIGTERM, sigterm_handler)
-def safeRpcCall(function, *args):
-  retry = 64
-  while True:
-    try:
-      return function(*args)
-    except (socket.error, xmlrpclib.ProtocolError), e:
-      print >>sys.stderr, e
-      pprint.pprint(args, file(function._Method__name, 'w'))
-      time.sleep(retry)
-      retry += retry >> 1
-def getInputOutputFileList(config, command_name):
-  stdout = open(os.path.join(
-                config['instance_root'],'.%s_out' % command_name),
-                'w+')
-  stdout.write("%s\n" % command_name)
-  stderr = open(os.path.join(
-                config['instance_root'],'.%s_err' % command_name),
-                'w+')
-  return (stdout, stderr)
-slapos_controler = None
-def run(args):
-  config = args[0]
-  slapgrid = None
-  supervisord_pid_file = os.path.join(config['instance_root'], 'var', 'run',
-        'supervisord.pid')
-  subprocess.check_call([config['git_binary'],
-                "config", "--global", "http.sslVerify", "false"])
-  previous_revision = None
-  run_software = True
-  # Write our own software.cfg to use the local repository
-  custom_profile_path = os.path.join(config['working_directory'], 'software.cfg')
-  config['custom_profile_path'] = custom_profile_path
-  vcs_repository_list = config['vcs_repository_list']
-  profile_content = None
-  assert len(vcs_repository_list), "we must have at least one repository"
-  for vcs_repository in vcs_repository_list:
-    url = vcs_repository['url']
-    buildout_section_id = vcs_repository.get('buildout_section_id', None)
-    repository_id = buildout_section_id or \
-                                  url.split('/')[-1].split('.')[0]
-    repository_path = os.path.join(config['working_directory'],repository_id)
-    vcs_repository['repository_id'] = repository_id
-    vcs_repository['repository_path'] = repository_path
-    if profile_content is None:
-      profile_content = """
-[buildout]
-extends = %(software_config_path)s
-""" %  {'software_config_path': os.path.join(repository_path,
-                                          config['profile_path'])}
-    if not(buildout_section_id is None):
-      profile_content += """
-[%(buildout_section_id)s]
-repository = %(repository_path)s
-branch = %(branch)s
-""" %  {'buildout_section_id': buildout_section_id,
-        'repository_path' : repository_path,
-        'branch' : vcs_repository.get('branch','master')}
-  custom_profile = open(custom_profile_path, 'w')
-  custom_profile.write(profile_content)
-  custom_profile.close()
-  config['repository_path'] = repository_path
-  sys.path.append(repository_path)
-  test_suite_title = config['test_suite_title'] or config['test_suite']
-  retry_software = False
-  try:
-    while True:
-      # kill processes from previous loop if any
-      try:
-        for pgpid in process_group_pid_set:
-          try:
-            os.killpg(pgpid, signal.SIGTERM)
-          except:
-            pass
-        process_group_pid_set.clear()
-        full_revision_list = []
-        # Make sure we have local repository
-        for vcs_repository in vcs_repository_list:
-          repository_path = vcs_repository['repository_path']
-          repository_id = vcs_repository['repository_id']
-          if not os.path.exists(repository_path):
-            parameter_list = [config['git_binary'], 'clone',
-                              vcs_repository['url']]
-            if vcs_repository.get('branch') is not None:
-              parameter_list.extend(['-b',vcs_repository.get('branch')])
-            parameter_list.append(repository_path)
-            subprocess.check_call(parameter_list)
-          # Make sure we have local repository
-          updater = Updater(repository_path, git_binary=config['git_binary'])
-          updater.checkout()
-          revision = "-".join(updater.getRevision())
-          full_revision_list.append('%s=%s' % (repository_id, revision))
-        revision = ','.join(full_revision_list)
-        if previous_revision == revision:
-          time.sleep(120)
-          if not(retry_software):
-            continue
-        retry_software = False
-        previous_revision = revision
-        print config
-        portal_url = config['test_suite_master_url']
-        test_result_path = None
-        test_result = (test_result_path, revision)
-        if portal_url:
-          if portal_url[-1] != '/':
-            portal_url += '/'
-          portal = xmlrpclib.ServerProxy("%s%s" %
-                      (portal_url, 'portal_task_distribution'),
-                      allow_none=1)
-          master = portal.portal_task_distribution
-          assert master.getProtocolRevision() == 1
-          test_result = safeRpcCall(master.createTestResult,
-            config['test_suite'], revision, [],
-            False, test_suite_title,
-            config['test_node_title'], config['project_title'])
-        print "testnode, test_result : %r" % (test_result,)
-        if test_result:
-          test_result_path, test_revision = test_result
-          if revision != test_revision:
-            for i, repository_revision in enumerate(test_revision.split(',')):
-              vcs_repository = vcs_repository_list[i]
-              repository_path = vcs_repository['repository_path']
-              # other testnodes on other boxes are already ready to test another
-              # revision
-              updater = Updater(repository_path, git_binary=config['git_binary'],
-                                revision=repository_revision.split('-')[1])
-              updater.checkout()
-          # Now prepare the installation of SlapOS and create instance
-          slapos_controler = SlapOSControler(config,
-            process_group_pid_set=process_group_pid_set)
-          for method_name in ("runSoftwareRelease", "runComputerPartition"):
-            stdout, stderr = getInputOutputFileList(config, method_name)
-            slapos_method = getattr(slapos_controler, method_name)
-            status_dict = slapos_method(config,
-              environment=config['environment'],
-              process_group_pid_set=process_group_pid_set,
-              stdout=stdout, stderr=stderr
-              )
-            if status_dict['status_code'] != 0:
-              break
-          if status_dict['status_code'] != 0:
-            safeRpcCall(master.reportTaskFailure,
-              test_result_path, status_dict, config['test_node_title'])
-            retry_software = True
-            continue
-          partition_path = os.path.join(config['instance_root'],
-                                        config['partition_reference'])
-          run_test_suite_path = os.path.join(partition_path, 'bin',
-                                            'runTestSuite')
-          if not os.path.exists(run_test_suite_path):
-            raise ValueError('No %r provided' % run_test_suite_path)
-          run_test_suite_revision = revision
-          if isinstance(revision, tuple):
-            revision = ','.join(revision)
-          # Deal with Shebang size limitation
-          file_object = open(run_test_suite_path, 'r')
-          line = file_object.readline()
-          file_object.close()
-          invocation_list = []
-          if line[:2] == '#!':
-            invocation_list = line[2:].split()
-          invocation_list.extend([run_test_suite_path,
-                                  '--test_suite', config['test_suite'],
-                                  '--revision', revision,
-                                  '--test_suite_title', test_suite_title,
-                                  '--node_quantity', config['node_quantity'],
-                                  '--master_url', config['test_suite_master_url']])
-          run_test_suite = subprocess.Popen(invocation_list)
-          process_group_pid_set.add(run_test_suite.pid)
-          run_test_suite.wait()
-          process_group_pid_set.remove(run_test_suite.pid)
-      except SubprocessError:
-        time.sleep(120)
-        continue
-  finally:
-    # Nice way to kill *everything* generated by run process -- process
-    # groups working only in POSIX compilant systems
-    # Exceptions are swallowed during cleanup phase
-    print "going to kill %r" % (process_group_pid_set,)
-    for pgpid in process_group_pid_set:
-      try:
-        os.killpg(pgpid, signal.SIGTERM)
-      except:
-        pass
-    try:
-      if os.path.exists(supervisord_pid_file):
-        os.kill(int(open(supervisord_pid_file).read().strip()), signal.SIGTERM)
-    except:
-      pass
\ No newline at end of file
--- a/slapos/recipe/kvm/__init__.py
+++ b/slapos/recipe/kvm/__init__.py
@@ -59,7 +59,8 @@ class Recipe(BaseSlapRecipe):
    # Install the socket_connection_attempt script
    catcher = zc.buildout.easy_install.scripts(
-      [('check_port_listening', __name__ + 'socket_connection_attempt', 'connection_attempt')],
+      [('check_port_listening', 'slapos.recipe.kvm.socket_connection_attempt',
+        'connection_attempt')],
      self.ws,
      sys.executable,
      self.bin_directory,
@@ -84,11 +85,11 @@ class Recipe(BaseSlapRecipe):
    self.linkBinary()
    self.computer_partition.setConnectionDict(dict(
-        url = "https://[%s]:%s/vnc.html?host=[%s]&port=%s&encrypt=1" % (noVNC_conf['source_ip'],
+        url = "https://[%s]:%s/vnc_auto.html?host=[%s]&port=%s&encrypt=1" % (
-                                                     noVNC_conf['source_port'],
+            noVNC_conf['source_ip'],
-                                                     noVNC_conf['source_ip'],
+            noVNC_conf['source_port'],
-                                                     noVNC_conf['source_port']
+            noVNC_conf['source_ip'],
-                                                     ),
+            noVNC_conf['source_port']),
        password = kvm_conf['vnc_passwd']))
    return self.path_list
@@ -155,7 +156,8 @@ class Recipe(BaseSlapRecipe):
    # Instanciate KVM
    kvm_template_location = pkg_resources.resource_filename(
-      __name__, 'template/kvm_run.in')
+                                             __name__, os.path.join(
+                                             'template', 'kvm_run.in'))
    kvm_runner_path = self.createRunningWrapper("kvm",
          self.substituteTemplate(kvm_template_location,
@@ -165,7 +167,9 @@ class Recipe(BaseSlapRecipe):
    # Instanciate KVM controller
    kvm_controller_template_location = pkg_resources.resource_filename(
-      __name__, 'template/kvm_controller_run.in')
+                                             __name__, os.path.join(
+                                             'template',
+                                             'kvm_controller_run.in' ))
    kvm_controller_runner_path = self.createRunningWrapper("kvm_controller",
          self.substituteTemplate(kvm_controller_template_location,
@@ -205,34 +209,24 @@ class Recipe(BaseSlapRecipe):
    """
    noVNC_conf = {}
    noVNC_conf['source_ip']   = source_ip
    noVNC_conf['source_port'] = source_port
-    # Install numpy.
+    execute_arguments = [[
-    # XXX-Cedric : this looks like a hack. Do we have better solution, knowing
+        self.options['websockify'].strip(),
-    # That websockify is not an egg?
+        '--web',
-    numpy = zc.buildout.easy_install.install(['numpy'], self.options['eggs-directory'])
+        self.options['noVNC_location'],
-    environment = dict(PYTHONPATH='%s' % numpy.entries[0])
+        '--key=%s' % (self.key_path),
+        '--cert=%s' % (self.certificate_path),
-    # Instanciate Websockify
+        '--ssl-only',
-    websockify_runner_path = zc.buildout.easy_install.scripts([('websockify',
+        '%s:%s' % (source_ip, source_port),
-      'slapos.recipe.librecipe.execute', 'executee_wait')], self.ws,
+        '%s:%s' % (target_ip, target_port)],
-      sys.executable, self.wrapper_directory, arguments=[
+        [self.certificate_path, self.key_path]]
-        [sys.executable.strip(),
-         self.options['websockify_path'],
+    self.path_list.extend(zc.buildout.easy_install.scripts([('websockify',
-         '--web',
+      'slapos.recipe.librecipe.execute', 'execute_wait')], self.ws, sys.executable,
-         self.options['noVNC_location'],
+      self.wrapper_directory, arguments=execute_arguments))
-         '--key=%s' % (self.key_path),
-         '--cert=%s' % (self.certificate_path),
-         '--ssl-only',
-         '%s:%s' % (source_ip, source_port),
-         '%s:%s' % (target_ip, target_port)],
-        [self.certificate_path, self.key_path],
-        environment]
-       )[0]
-    self.path_list.append(websockify_runner_path)
    # Add noVNC promise
    self.port_listening_promise_conf.update(hostname=noVNC_conf['source_ip'],

--- a/slapos/recipe/lamp/__init__.py
+++ b/slapos/recipe/lamp/__init__.py
@@ -127,9 +127,11 @@ class BaseRecipe(BaseSlapRecipe):
        self.substituteTemplate(pkg_resources.resource_filename(__name__,
          'template/apache.in'), apache_config))
    self.path_list.append(config_file)
+    php_ini = pkg_resources.resource_filename(__name__, 'template/php.ini.in')
+    if self.options.has_key('php_ini'):
+      php_ini = os.path.join(self.options['php_ini'], 'php.ini.in')
    self.path_list.append(self.createConfigurationFile('php.ini',
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+        self.substituteTemplate(php_ini, dict(tmp_directory=self.tmp_directory))))
-          'template/php.ini.in'), dict(tmp_directory=self.tmp_directory))))
    self.path_list.extend(zc.buildout.easy_install.scripts([(
      'httpd',
        __name__ + '.apache', 'runApache')], self.ws,
@@ -153,23 +155,23 @@ class BaseRecipe(BaseSlapRecipe):
    destination = os.path.join(path, file)
    open(destination, 'w').write(open(template, 'r').read() % d)
-  def configureInstallation(self, document_root, mysql_conf, url):
+  def configureInstallation(self, document_root, url, mysql_conf):
    """Start process which can launch python scripts, move or remove files or 
    directories when installing software.
    """
    if not self.options.has_key('delete') and not self.options.has_key('rename') and not\
        self.options.has_key('chmod') and not self.options.has_key('script'):
-      return
+      return ""
    delete = []
    chmod = []
    data = []
    rename = []
    rename_list = ""
-    argument = [self.options['lampconfigure_directory'].strip()]
+    argument = [self.options['lampconfigure_directory'].strip(),
+                             "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
+                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']]
    if not self.options.has_key('file_token'):
      argument = argument + ["-d", mysql_conf['mysql_database'],
-                             "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
-                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'],
                             "--table", self.options['table_name'].strip(), "--cond",
                             self.options['constraint'].strip()]
    else:
@@ -193,9 +195,9 @@ class BaseRecipe(BaseSlapRecipe):
        if self.options.has_key('rename_chmod'):
          cmd += ["--chmod", self.options['rename_chmod'].strip()]
        rename.append(cmd + [fname[0].strip(), fname[1].strip()])
-        rename_list += fname[0] + "=>" + fname[1] + " "
+        rename_list += fname[0] + " to " + fname[1] + " "
    if self.options.has_key('chmod'):
-      chmod = ["chmod ", self.options['mode'].strip()]
+      chmod = ["chmod", self.options['mode'].strip()]
      for fname in self.options['chmod'].split(','):
        chmod.append(fname.strip())
    if self.options.has_key('script') and \
@@ -225,12 +227,14 @@ class Simple(BaseRecipe):
    self.createHtdocs(self.options['source'].strip(), document_root)
    mysql_conf = self.installMysqlServer()
    url = self.installApache(document_root)
-    renamed = self.configureInstallation(document_root, mysql_conf, url)
+    renamed = self.configureInstallation(document_root, url, mysql_conf)
-    self.setConnectionDict(dict(
+    connectionDict = dict(
-      url=url,
+      url=url,      
-      rename=renamed,
      **mysql_conf
-    ))
+    )
+    if not renamed == "":
+      connectionDict['rename'] = renamed
+    self.setConnectionDict(connectionDict)
    if self.options.has_key('template') and self.options.has_key('configuration'):
      self.createConfiguration(self.options['template'], document_root,
          self.options['configuration'], mysql_conf)

--- a/software/MediaWiki/instance.cfg
+++ b/software/MediaWiki/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/MediaWiki/software.cfg
+++ b/software/MediaWiki/software.cfg
@@ -19,35 +19,20 @@ extends =
 [mediawiki-patch]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/patch/mediawiki-1.17.0.config.patch
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = fd606666ac9fc54cb84cda8cf08edef4
-download-only = True
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = mediawiki-1.17.0.config.patch
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://download.wikimedia.org/mediawiki/1.17/mediawiki-1.17.0.tar.gz
 md5sum = 871a00a8eb6dcae1b7b654ae635af7cd
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [patch]
 recipe = iw.recipe.cmd
 on_install = true
 on_update = true
 cmds= patch -d ${application:location} -p1 < ${mediawiki-patch:location}/${mediawiki-patch:filename}
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/mediawiki.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -70,6 +55,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/MediaWiki/template/mediawiki.inc.php.in
+++ b/software/MediaWiki/template/mediawiki.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/SilverStripe/instance.cfg
+++ b/software/SilverStripe/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/SilverStripe/software.cfg
+++ b/software/SilverStripe/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.silverstripe.org/assets/downloads/SilverStripe-v2.4.5.tar.gz
 md5sum = de6ab0146c27bbc72287670e0697e2ba
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/silverstripe.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/SilverStripe/template/silverstripe.inc.php.in
+++ b/software/SilverStripe/template/silverstripe.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/b2evolution/software.cfg
+++ b/software/b2evolution/software.cfg
@@ -14,14 +14,10 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://freefr.dl.sourceforge.net/project/evocms/b2evolution/b2evo%204.1.1-stable/b2evolution-4.1.1-stable-2011-10-03.zip
 md5sum = 63c771f43f0c40ff822fe80234be42e1
-script =
+extract-directory = blogs
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/blogs", "${buildout:parts-directory}/${:_buildout_section_name_}")
 [instance-recipe]
 egg = slapos.cookbook
@@ -44,6 +40,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/cmsmadesimple/software.cfg
+++ b/software/cmsmadesimple/software.cfg
@@ -14,11 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://s3.amazonaws.com/cmsms/downloads/7908/cmsmadesimple-1.9.4.3-english.tar.gz
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = b018842f195a20e50359b18c585f4d64
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
 [instance-recipe]
 egg = slapos.cookbook
@@ -41,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/coppermine/software.cfg
+++ b/software/coppermine/software.cfg
@@ -14,17 +14,14 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://freefr.dl.sourceforge.net/project/coppermine/Coppermine/1.5.x/cpg1.5.16.zip
 md5sum = 76402aea7821aaaf67c571869373186e
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [application-template]
 recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/coppermine.inc.php.in
+url = ${:_profile_base_location_}/template/coppermine.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = c97345b7f3c060b825e1925e2be3c2c1
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -53,6 +50,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode
@@ -64,4 +139,3 @@ download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
 stop-on-error = True
--- a/software/dotclear/software.cfg
+++ b/software/dotclear/software.cfg
@@ -14,17 +14,14 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://download.dotclear.net/latest-2.0.tar.gz
 md5sum = 98263b4734f93b7c54d3ab436bf344e3
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/dotclear.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = c97345b7f3c060b825e1925e2be3c2c1
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -53,6 +50,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/dotproject/software.cfg
+++ b/software/dotproject/software.cfg
@@ -14,23 +14,20 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://downloads.sourceforge.net/project/dotproject/dotproject/dotProject%20Version%202.1.5/dotproject-2.1.5.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fdotproject%2F&ts=1315317307&use_mirror=freefr
 md5sum = d283fad3fc541e7ffda07151efc64bf8
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/config.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = b78545a6928978c5990021ac68e26be0
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [application-configuration]
-location = config.inc.php
+location = config.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +50,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/drupal/software.cfg
+++ b/software/drupal/software.cfg
@@ -14,11 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz
 md5sum = e0226b56e8d5c57c6b126e8ed5866b1f
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [instance-recipe]
 egg = slapos.cookbook
@@ -41,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/eSKUeL/software.cfg
+++ b/software/eSKUeL/software.cfg
@@ -14,11 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.phptools4u.com/generated_content/download/eskuel.zip
 md5sum = c91f6f238be715f303911dd00f281b78
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
 [instance-recipe]
 egg = slapos.cookbook
@@ -41,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/erp5testnode/instance.cfg
+++ b/software/erp5testnode/instance.cfg
@@ -8,11 +8,11 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 [testnode]
 recipe = slapos.cookbook:erp5testnode
-buildbot_binary = ${buildout:bin-directory}/buildbot
+git_binary = ${git:location}/bin/git
 slapgrid_partition_binary = ${buildout:bin-directory}/slapgrid-cp
 slapgrid_software_binary = ${buildout:bin-directory}/slapgrid-sr
 slapproxy_binary = ${buildout:bin-directory}/slapproxy
 svn_binary = ${subversion:location}/bin/svn
-git_binary = ${git:location}/bin/git
 svnversion_binary = ${subversion:location}/bin/svnversion
+testnode = ${buildout:bin-directory}/testnode
 zip_binary = ${zip:location}/bin/zip
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
 [buildout]
-extensions =
-  slapos.rebootstrap
-  slapos.zcbworkarounds
-  mr.developer
 find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
    http://dist.repoze.org
@@ -14,10 +10,10 @@ include-site-packages = false
 exec-sitecustomize = false
 versions = versions
-rebootstrap-section = python2.6
 extends =
-  ../../component/python-2.6/buildout.cfg
+  ../../stack/shacache-client.cfg
+  ../../component/python-2.7/buildout.cfg
  ../../component/subversion/buildout.cfg
  ../../component/git/buildout.cfg
  ../../component/lxml-python/buildout.cfg
@@ -25,37 +21,181 @@ extends =
 parts =
  template
-  bootstrap
+  lxml-python
  eggs
  subversion
  zip
  git
+  checkrecipe
-[bootstrap]
+# Separate from site eggs
-recipe = zc.recipe.egg
+allowed-eggs-from-site-packages =
-eggs = zc.buildout
+include-site-packages = false
-suffix =
+exec-sitecustomize = false
-scripts =
-    buildout=bootstrap2.6
+# Use only quite well working sites.
-arguments = sys.argv[1:] + ["bootstrap"]
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
-[rebootstrap]
+develop =
-section = python2.6
+  ${:parts-directory}/slapos.cookbook-repository
-version = 1
+  ${:parts-directory}/erp5.util-repository
+[checkrecipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/slapos.git
+branch = master
+revision = 33e2a6315965925b3585d3dcbe246055bb852cba
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+[erp5.util-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/erp5.git
+branch = master
+revision = 917d196176e6291d3046abb6177
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-009
+Jinja2 = 2.6
+Werkzeug = 0.8.1
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+lxml = 2.3.2
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.core = 0.19
+slapos.libnetworkcache = 0.10
+slapos.recipe.template = 2.2
+# Required by:
+# slapos.core==0.19
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.35  
+PyXML = 0.8.5
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.35  
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.19
+netifaces = 0.6
+# Required by:
+# erp5.util==0.3-dev
+# slapos.cookbook==0.35  
+# slapos.core==0.19
+# slapos.libnetworkcache==0.10
+# zc.buildout==1.5.3-dev-SlapOS-009
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.core==0.19
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.35  
+xml-marshaller = 0.9.7   
+# Required by:
+# slapos.cookbook==0.35  
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.19
+zope.interface = 3.8.0   
 [eggs]
 recipe = zc.recipe.egg
+# Just so buildout executes [slapos.cookbook-repository] before [eggs], as
+# - [eggs] references [slapos.cookbook-repository]
+# - [instance-recipe] needs [slapos.cookbook-repository] to be finished
+# - we cannot rely on anything else being executed before [eggs]
+dummy =
+  ${slapos.cookbook-repository:location}
+  ${erp5.util-repository:location}
 eggs =
  ${lxml-python:egg}
+  zc.buildout
+  slapos.libnetworkcache
  slapos.core
  slapos.cookbook
+  erp5.util[testnode]
+scripts =
+  testnode = erp5.util.testnode:main
+  slapgrid-cp = slapos.grid.slapgrid:runComputerPartition
+  slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
+  slapproxy = slapos.proxy:main
+python = python2.7
+[lxml-python]
+python = python2.7
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
+md5sum = 08e3f92bce41efc5bfe044bb9d354786
+[networkcache]
+# Romain Courteaud + Sebastien Robin signature certificate
+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-----
--- a/software/ezpublish/instance.cfg
+++ b/software/ezpublish/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/ezpublish/software.cfg
+++ b/software/ezpublish/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://share.ez.no/content/download/118008/553423/version/3/file/ezpublish_community_project-2011.8-with_ezc.tar.bz2
 md5sum = 76ea4e1de7a3f91c8d24ef3a221e0777
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/ezpublish.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/ezpublish/template/ezpublish.inc.php.in
+++ b/software/ezpublish/template/ezpublish.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/joomla/instance.cfg
+++ b/software/joomla/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/joomla/software.cfg
+++ b/software/joomla/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz
 md5sum = 19451c0352e4c72d871cc8817126286a
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/phpmyadmin.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -54,6 +40,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/joomla/template/phpmyadmin.inc.php.in
+++ b/software/joomla/template/phpmyadmin.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/kvm/instance.cfg
+++ b/software/kvm/instance.cfg
@@ -11,7 +11,7 @@ qemu_path = ${kvm:location}/bin/qemu-system-x86_64
 qemu_img_path = ${kvm:location}/bin/qemu-img
 #slapmonitor_path = ${buildout:bin-directory}/slapmonitor
 #slapreport_path = ${buildout:bin-directory}/slapreport
-websockify_path = ${noVNC:location}/utils/wsproxy.py
+websockify = ${buildout:directory}/bin/websockify
 noVNC_location = ${noVNC:location}
 openssl_binary = ${openssl:location}/bin/openssl
 rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup

--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
 [buildout]
 extends =
-  ../../stack/kvm.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/gnutls/buildout.cfg
+  ../../component/libpng/buildout.cfg
+  ../../component/libuuid/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/noVNC/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../stack/shacache-client.cfg
+develop =
+  ${:parts-directory}/websockify
+parts =
+  template
+  kvm
+  eggs
+  check-local-eggs
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+versions = versions
+# 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
+#XXX-Cedric : Currently, one can only access to KVM using noVNC.
+#             Ideally one should be able to access KVM by using either NoVNC or VNC.
+#             Problem is : no native crypto support in web browsers. So we have to disable ssl
+#             In qemu builtin vnc server, and make it available only for localhost 
+#             so that only novnc can listen to it.
+#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
+#            When qemu has builtin support for websockets in vnc server to get rid of 
+#            Websockify (socket <-> websocket proxy server) when it is ready.
+#            May solve previous XXX depending on the implementation.
+#XXX-Cedric: Check status of 
+#            https://www.tiolive.com/nexedi/bug_module/20110819-11F4F70 for
+#            Chrome >= 14 and Firefox >=7 can access to noVNC. (should be solved)
+#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
+[kvm]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/0.15.1/qemu-kvm-0.15.1.tar.gz
+md5sum = 8800a7d6b3aa4a168ea7f78dc66c0320
+configure-options =
+  --disable-sdl
+  --disable-xen
+  --enable-vnc-tls
+  --disable-vnc-sasl
+  --disable-curses
+  --disable-curl
+  --enable-kvm
+  --disable-docs
+  --enable-vnc-png
+  --disable-vnc-jpeg
+  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
+  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
+  --disable-werror
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+[websockify]
+# XXX-Cedric : use official egg from pypi when it is released
+recipe = plone.recipe.command
+stop-on-error = true
+commit = e7363f43443deb9982bdb5c3db50eec475584b06
+repository = https://github.com/desaintmartin/websockify.git
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+git-binary = ${git:location}/bin/git
+command = (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit}) || (rm -fr ${:location}; exit 1)
+update-command =
+[check-local-eggs]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/websockify.egg-link
+depends = ${eggs:dummy}
+[eggs]
+python = python2.7
+recipe = z3c.recipe.scripts
+dummy =
+  ${websockify:location}
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  websockify
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = d899f2111aab18ad25776f35ed49a91b
+md5sum = 298b146e4efce41bfd58b3f85d064ff1
 output = ${buildout:directory}/template.cfg
 mode = 0644
-[kvmsource]
-command =
-  (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} && cd ${:location} && ${git:location}/bin/git reset --hard 94ee45cc02e69798cac8209d2296fd1751125018) || (rm -fr ${:location} ; exit 1)
-update-command =
 [versions]
+zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
-Werkzeug = 0.7.1
+Werkzeug = 0.8.1
-buildout-versions = 1.6
+buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
+lxml = 2.3.1
 meld3 = 0.6.7
-numpy = 1.6.1
 plone.recipe.command = 1.1
-slapos.recipe.template = 1.1
+slapos.cookbook = 0.35
+slapos.recipe.template = 2.2
+z3c.recipe.scripts = 1.0.1
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.19
-Flask = 0.7.2
+Flask = 0.8
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
 PyXML = 0.8.4
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.9
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
 hexagonit.recipe.download = 1.5.0
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
-netaddr = 0.7.5
+netaddr = 0.7.6
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.19
-netifaces = 0.5
+netifaces = 0.6
+# Required by:
+# websockify==0.1-dev
+numpy = 1.6.1
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
-# slapos.core==0.14
+# slapos.core==0.19
-# zc.buildout==1.5.3-dev-SlapOS-005
+# zc.buildout==1.5.3-dev-SlapOS-010
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
-slapos.core = 0.14
+slapos.core = 0.19
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.19
 supervisor = 3.0a10
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
 xml-marshaller = 0.9.7
 # Required by:
-# slapos.cookbook==0.20
+# slapos.cookbook==0.35
 zc.recipe.egg = 1.3.2
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.19
-zope.interface = 3.7.0
+zope.interface = 3.8.0
\ No newline at end of file
--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -10,21 +10,21 @@ parts =
  downloadcache-workaround
 extends =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/lamp.cfg
+  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.60:/stack/lamp.cfg
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/shacache-client.cfg
+  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.60:/stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = Student shall put here url of zipped or tarballed web page or application
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = Student may put here md5sum of this file, this is good idea
 #If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
+strip-top-level-dir = true
+#extract-directory = 
 [application-template]
 recipe = slapos.recipe.download
 url = Student shall put here url to template file for application
 #md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -44,10 +44,14 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
+[mariadb]
+keep-compile-dir = false
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
+eggs = 
+  ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout

--- a/software/lamp-template/template/php.ini.in
+++ b/software/lamp-template/template/php.ini.in
+[PHP]
+engine = On
+safe_mode = Off
+expose_php = Off
+error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
+display_errors = On
+display_startup_errors = Off
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+session.save_path = "%(tmp_directory)s"
+session.auto_start = 0
+date.timezone = Europe/Paris
+file_uploads = On
+upload_max_filesize = 16M
+post_max_size = 16M
+magic_quotes_gpc=Off
--- a/software/xoops/template/wp-config.php.in
+++ b/software/xoops/template/wp-config.php.in
 <?php
 /**
 * The base configurations of the WordPress.
 *
 * This file has the following configurations: MySQL settings, Table Prefix,
 * Secret Keys, WordPress Language, and ABSPATH. You can find more information
 * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
 * wp-config.php} Codex page. You can get the MySQL settings from your web host.
 *
 * This file is used by the wp-config.php creation script during the
 * installation. You don't have to use the web site, you can just copy this file
 * to "wp-config.php" and fill in the values.
 *
 * @package WordPress
 */
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
 define('DB_NAME', 'Put here mysql database name template key');
 /** MySQL database username */
 define('DB_USER', 'Put here mysql user template key');
 /** MySQL database password */
 define('DB_PASSWORD', 'Put here mysql password template key');
 /** MySQL hostname */
 define('DB_HOST', 'Put here mysql host template key');
 /** Database Charset to use in creating database tables. */
 define('DB_CHARSET', 'utf8');
 /** The Database Collate type. Don't change this if in doubt. */
 define('DB_COLLATE', '');
 /**#@+
 * Authentication Unique Keys and Salts.
 *
 * Change these to different unique phrases!
 * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
 * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
 *
 * @since 2.6.0
 */
 define('AUTH_KEY',         'put your unique phrase here');
 define('SECURE_AUTH_KEY',  'put your unique phrase here');
 define('LOGGED_IN_KEY',    'put your unique phrase here');
 define('NONCE_KEY',        'put your unique phrase here');
 define('AUTH_SALT',        'put your unique phrase here');
 define('SECURE_AUTH_SALT', 'put your unique phrase here');
 define('LOGGED_IN_SALT',   'put your unique phrase here');
 define('NONCE_SALT',       'put your unique phrase here');
 /**#@-*/
 /**
 * WordPress Database Table prefix.
 *
 * You can have multiple installations in one database if you give each a unique
 * prefix. Only numbers, letters, and underscores please!
 */
 $table_prefix  = 'wp_';
 /**
 * WordPress Localized Language, defaults to English.
 *
 * Change this to localize WordPress. A corresponding MO file for the chosen
 * language must be installed to wp-content/languages. For example, install
 * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
 * language support.
 */
 define('WPLANG', '');
 /**
 * For developers: WordPress debugging mode.
 *
 * Change this to true to enable the display of notices during development.
 * It is strongly recommended that plugin and theme developers use WP_DEBUG
 * in their development environments.
 */
 define('WP_DEBUG', false);
 /* That's all, stop editing! Happy blogging. */
 /** Absolute path to the WordPress directory. */
 if ( !defined('ABSPATH') )
 	define('ABSPATH', dirname(__FILE__) . '/');
 /** Sets up WordPress vars and included files. */
 require_once(ABSPATH . 'wp-settings.php');
--- a/software/magento/instance.cfg
+++ b/software/magento/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/magento/software.cfg
+++ b/software/magento/software.cfg
@@ -13,23 +13,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.magentocommerce.com/downloads/assets/1.6.0.0/magento-1.6.0.0.tar.gz
 md5sum = 7415eb1c70b7694ab632326d9fcc850a
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/magento.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -52,6 +38,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/magento/template/magento.inc.php.in
+++ b/software/magento/template/magento.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/net2ftp/software.cfg
+++ b/software/net2ftp/software.cfg
@@ -15,27 +15,23 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.net2ftp.com/download/net2ftp_v0.98.zip
 md5sum = 5a2741b5881f3f229a788958dc6cdf10
-script =
+extract-directory = files_to_upload
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/files_to_upload", "${buildout:parts-directory}/${:_buildout_section_name_}")
 [configure-script]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure.py
+md5sum = f7e1766468f7a8d51d311541164c3ff4
 filename = configure.py
-download-only = True
+mode = 0744
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/net2ftp.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = 5ad3b2b42affd83229f0666c480b90cb
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -67,6 +63,84 @@ eggs =
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/openX/instance.cfg
+++ b/software/openX/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/openX/software.cfg
+++ b/software/openX/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://download.openx.org/openx-2.8.7.tar.gz
 md5sum = 23fa5052af6d4411e8b84284894ff619
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/openx.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/openX/template/openx.inc.php.in
+++ b/software/openX/template/openx.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/os-commerce/instance.cfg
+++ b/software/os-commerce/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/os-commerce/software.cfg
+++ b/software/os-commerce/software.cfg
@@ -14,26 +14,10 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.oscommerce.com/files/oscommerce-3.0.2.zip
 md5sum = 680caf7dde7cf7772a576ef3930970ff
-script =
+extract-directory = oscommerce
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/oscommerce", "${buildout:parts-directory}/${:_buildout_section_name_}")
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/os-commerce.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -56,6 +40,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/os-commerce/template/os-commerce.inc.php.in
+++ b/software/os-commerce/template/os-commerce.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/phpbb/instance.cfg
+++ b/software/phpbb/instance.cfg
@@ -7,8 +7,7 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
+lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/phpbb/software.cfg
+++ b/software/phpbb/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.phpbb.com/files/release/phpBB-3.0.9.zip
 md5sum = fb8025a51a3c756fe6151a6b0beeefd4
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/phpbb.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -47,12 +33,93 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/phpbb/template/phpbb.inc.php.in
+++ b/software/phpbb/template/phpbb.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'Put here mysql host template key';
-$cfg['Servers'][$i]['port'] = 'Put here mysql port template key';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/phpmyadmin/software.cfg
+++ b/software/phpmyadmin/software.cfg
@@ -21,15 +21,14 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/3.3.10/phpMyAdmin-3.3.10-all-languages.tar.bz2?r=http%3A%2F%2Fwww.phpmyadmin.net%2Fhome_page%2Fdownloads.php&ts=1300959842&use_mirror=sunet
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = cb7a632fb4f10a180ead15f7f90087f1
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/phpmyadmin.inc.php.in
 md5sum = caab45c34c75661c214f4628ff545bb4
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -41,24 +40,102 @@ location = config.inc.php
 egg = slapos.cookbook
 module = lamp.simple
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
 eggs = ${instance-recipe:egg}
 [versions]
-slapos.cookbook = 0.12
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-010
-# Required by slapos.cookbook==0.12
-slapos.core = 0.8
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+meld3 = 0.6.7
 plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
-# Use SlapOS patched zc.buildout
+# Required by:
-zc.buildout = 1.5.3-dev-SlapOS-005
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
+[downloadcache-workaround]
+# workaround irritating problem of hexagonit.recipe.cmmi which automatically
+# creates download cache, which in turn switches builout to "semi-offline" mode
+recipe = plone.recipe.command
+# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
+# to ${buildout:directory}/downloads but this variable is available late, that's
+# why it is hardcoded only for required case
+download-cache = ${buildout:directory}/downloads
+command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
+update-command = ${:command}
+stop-on-error = True
--- a/software/phpnuke/software.cfg
+++ b/software/phpnuke/software.cfg
@@ -14,20 +14,15 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://phpnuke.org/modules/Release/files/phpnuke-release-8.2.4.tar.gz
 md5sum = 0f31895b141f50a5f2e6f083b0222fe2
-script =
+extract-directory = html
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/html", "${buildout:parts-directory}/${:_buildout_section_name_}")
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/phpnuke.inc.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -56,6 +51,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/pimcore/instance.cfg
+++ b/software/pimcore/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/pimcore/software.cfg
+++ b/software/pimcore/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.pimcore.org/download/pimcore-latest.zip
-md5sum = 58cfa935ed308476b95cf364af7719c3
+md5sum = 5cc0351fb01bca93f384071bff69be2e
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/pimcore.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/pimcore/template/pimcore.inc.php.in
+++ b/software/pimcore/template/pimcore.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/piwigo/software.cfg
+++ b/software/piwigo/software.cfg
@@ -14,23 +14,21 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://piwigo.org/download/dlcounter.php?code=latest
 md5sum = 13870130dcdda90bf2d2e3c20a49b04f
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/piwigo.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+md5sum = 8ca6d1408b468c6836cd0edaf02688e5
 download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [application-configuration]
-location = config.inc.php
+location = database.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +51,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/piwigo/template/piwigo.inc.php.in
+++ b/software/piwigo/template/piwigo.inc.php.in
 <?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$conf['dblayer'] = 'mysql';
-$i = 0;
+$conf['db_base'] = '%(mysql_database)s';
-$i++;
+$conf['db_user'] = '%(mysql_user)s';
-/* Server parameters */
+$conf['db_password'] = '%(mysql_password)s';
-$cfg['Servers'][$i]['host'] = 'Put here mysql host template key';
+$conf['db_host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = 'Put here mysql port template key';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
+$prefixeTable = 'piwigo_';
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
+define('PHPWG_INSTALLED', true);
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
+define('PWG_CHARSET', 'utf-8');
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
+define('DB_CHARSET', 'utf8');
-$cfg['UploadDir'] = '';
+define('DB_COLLATE', '');
-$cfg['SaveDir'] = '';
 ?>
--- a/software/piwik/instance.cfg
+++ b/software/piwik/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/piwik/software.cfg
+++ b/software/piwik/software.cfg
@@ -15,26 +15,10 @@ extends =
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://piwik.org/latest.zip
-md5sum = fd16c7a15573c93feefd1dcba3ca40ba
+md5sum = 04c5dc7f595adce4d68be9f94bbb140c
-script =
+extract-directory = piwik
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/piwik", "${buildout:parts-directory}/${:_buildout_section_name_}")
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/piwik.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -57,6 +41,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/piwik/template/piwik.inc.php.in
+++ b/software/piwik/template/piwik.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/prestashop/software.cfg
+++ b/software/prestashop/software.cfg
@@ -14,11 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://www.prestashop.com/download/prestashop_1.4.5.1.zip
 md5sum = 3d19305d728f7e8a19f81f9f326b9383
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = true
 [instance-recipe]
 egg = slapos.cookbook
@@ -28,7 +26,6 @@ module = lamp.simple
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-#${:_profile_base_location_}/instance.cfg
 #md5sum = Student shall put md5 of instance.cfg here
 output = ${buildout:directory}/template.cfg
 mode = 0644
@@ -45,6 +42,84 @@ eggs =
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/punbb/software.cfg
+++ b/software/punbb/software.cfg
@@ -14,17 +14,14 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://punbb.informer.com/download/punbb-1.3.6.tar.gz
 md5sum = 9454ef78101028fd5acf2731f77545c2
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template/punbb.inc.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
 filename = template.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -53,6 +50,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/punbb/template/punbb.inc.php.in
+++ b/software/punbb/template/punbb.inc.php.in
 <?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = 'Put here mysql host template key';
-$cfg['Servers'][$i]['port'] = 'Put here mysql port template key';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
+$db_type = 'mysqli';
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
+$db_host = '%(mysql_host)s';
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
+$db_name = '%(mysql_database)s';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
+$db_username = '%(mysql_user)s';
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
+$db_password = '%(mysql_password)s';
-$cfg['UploadDir'] = '';
+$db_prefix = 'pbb_';
-$cfg['SaveDir'] = '';
+$p_connect = false;
-?>
+$base_url = 'http://webrunner:9080';
+$cookie_name = 'forum_cookie_173f50';
+$cookie_domain = '';
+$cookie_path = '/';
+$cookie_secure = 0;
+define('FORUM', 1);
--- a/software/simpleMachineForum/instance.cfg
+++ b/software/simpleMachineForum/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/simpleMachineForum/software.cfg
+++ b/software/simpleMachineForum/software.cfg
@@ -15,23 +15,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://mirror.ord.simplemachines.org/downloads/smf_2-0-1_install.tar.gz
 md5sum = 76817fc9f4620765bba4232bbf8b6b2b
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/simplemachine.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -54,6 +40,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/simpleMachineForum/template/simplemachine.inc.php.in
+++ b/software/simpleMachineForum/template/simplemachine.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/spip/instance.cfg
+++ b/software/spip/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/spip/software.cfg
+++ b/software/spip/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://files.spip.org/spip/stable/spip.zip?1316156624
 md5sum = 4500c283b464161da6fced7dce12ae0a
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/spip.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/spip/template/spip.inc.php.in
+++ b/software/spip/template/spip.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/statusnet/instance.cfg
+++ b/software/statusnet/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/statusnet/software.cfg
+++ b/software/statusnet/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://status.net/statusnet-1.0.1.tar.gz
 md5sum = 727a7cfe7e9531b732739dabd295bcb9
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/statusnet.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -52,7 +38,84 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.30
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/statusnet/template/statusnet.inc.php.in
+++ b/software/statusnet/template/statusnet.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/sugar-crm/software.cfg
+++ b/software/sugar-crm/software.cfg
@@ -14,11 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
-url = http://dl.sugarforge.org/sugarcrm/1SugarCE6.4.0/SugarCE6.4.0/SugarCE-6.4.0beta1.zip
+url = http://www.sugarforge.org/frs/download.php/8558/SugarCE-6.3.0RC3.zip
-md5sum = 6263a4f457df7ec2dc7ce2e877df95ed
+md5sum = ff4cf7c6f673f9f3f6e082c62736f628
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
 [instance-recipe]
 egg = slapos.cookbook
@@ -41,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/tiki/instance.cfg
+++ b/software/tiki/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/tiki/software.cfg
+++ b/software/tiki/software.cfg
@@ -14,23 +14,9 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://freefr.dl.sourceforge.net/project/tikiwiki/Tiki_7.x_Electra/7.1/tiki-7.1.tar.gz
 md5sum = 02c832eaaa107cd7c76f9d94f400eaf5
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/tiki.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -53,6 +39,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/tiki/template/tiki.inc.php.in
+++ b/software/tiki/template/tiki.inc.php.in
-<?php
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
-/* Server parameters */
-$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
-$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
-/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
-$cfg['Servers'][$i]['user'] = '';
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-?>
--- a/software/xoops/instance.cfg
+++ b/software/xoops/instance.cfg
@@ -7,8 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

--- a/software/xoops/software.cfg
+++ b/software/xoops/software.cfg
@@ -14,26 +14,10 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = slapos.recipe.build
+recipe = slapos.recipe.build:download-unpacked
 url = http://freefr.dl.sourceforge.net/project/xoops/XOOPS%20Core%20(stable%20releases)/XOOPS%202.5.1/xoops-2.5.1a.zip
 md5sum = 616f06443ae1a2dcea7191069492ccd2
-script =
+extract-directory = htdocs
-  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
-  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir + "/htdocs", "${buildout:parts-directory}/${:_buildout_section_name_}")
-[application-template]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template/xoops.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-[application-configuration]
-location = config.inc.php
 [instance-recipe]
 egg = slapos.cookbook
@@ -56,6 +40,84 @@ eggs = ${instance-recipe:egg}
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/software/zencart/software.cfg
+++ b/software/zencart/software.cfg
@@ -15,18 +15,18 @@ extends =
  ../../stack/shacache-client.cfg
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://heanet.dl.sourceforge.net/project/zencart/CURRENT_%20Zen%20Cart%201.3.x%20Series/Zen%20Cart%20v1.3.9%20-%20Full%20Release/zen-cart-v1.3.9h-full-fileset-10262010.zip
 md5sum = e0a5fb39078321ced7f5a9c193f30927
 #If provided tarball does not contain top directory, option shall be changed to false
 strip-top-level-dir = true
 [configure-script]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.download
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/configure.py
 filename = configure.py
-download-only = True
+mode = 0744
 [instance-recipe]
 egg = slapos.cookbook
@@ -52,6 +52,84 @@ eggs =
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+Jinja2 = 2.6
+MySQL-python = 1.2.3
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+plone.recipe.command = 1.1
+slapos.cookbook = 0.34
+slapos.recipe.build = 0.7
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.10
+# Required by:
+# slapos.core==0.18
+# slapos.toolbox==0.10
+Flask = 0.8
+# Required by:
+# slapos.cookbook==0.34
+PyXML = 0.8.4
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+# Required by:
+# slapos.cookbook==0.34
+netaddr = 0.7.6
+# Required by:
+# slapos.core==0.18
+netifaces = 0.6
+# Required by:
+# slapos.toolbox==0.10
+paramiko = 1.7.7.1
+# Required by:
+# slapos.toolbox==0.10
+psutil = 0.3.0
+# Required by:
+# slapos.cookbook==0.34
+# slapos.core==0.18
+# slapos.toolbox==0.10
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+slapos.core = 0.18
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+# Required by:
+# slapos.cookbook==0.34
+# slapos.toolbox==0.10
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.34
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -41,7 +41,10 @@ extends =
 recipe = zc.recipe.egg
 eggs =
  ${lxml-python:egg}
-  ${pycrypto-python:egg}  
+  ${pycrypto-python:egg}
+[mariadb]
+keep-compile-dir = false
 [application]
 #XXX-Cedric : ugly hack to work around h.r.cmmi unrespectful behavior, so that
@@ -52,7 +55,7 @@ depends = ${apache-php:location}
 [networkcache]
-# Romain Courteaud + Sebastien Robin signature certificate
+# Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
 signature-certificate-list =
  -----BEGIN CERTIFICATE-----
  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -68,30 +71,28 @@ signature-certificate-list =
  QUUGLQ==
  -----END CERTIFICATE-----
  -----BEGIN CERTIFICATE-----
-  MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDwyupMnruo3+Z2
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  1BBkQj+nCECu+TMI9s/0NVd73Hfst9GSr/eaZW8MJ6XNwyR/2DOkZs+1v97FBD9w
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  dT1Njg6WBF+Qavi5NU9D+XWOXNLQEJYIH1tEFbjcHKog4DplKOuOM59pBpVUak6Y
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  eZCoWXa3e7dNdv3jOUkqaTgG8Sv3tHetBTF2nSuj3M4ti66wV60Spo9L0BkeQl8j
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  h5qhr06aX0AYfrfHElWw4rvYz6ExIz4uP86/YlyktkI0DBNnI8uaOPKtgb8AzipF
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  b4wgWkwpmqCr/5+3DYFNIow2wkeq2XQKuC8um7EQXr3pDgCSEux5zb0sq7voyIhS
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  MIUIDQqXAgMBAAECggEBAKDIzdSltWcZQrmb9uoLdpdhIlfz3IkizU8jAyyY1ZdC
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  UvVg/LOjAZibLNKNeGTJiApCAHY7DVR+9qFwF6QetEyl1O4JD9YT677W5xFNmBMI
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  0DXSQk3fN1X66fsT3spHnaqRe+NUWwhIB/02R0qymlwAhzB5wSQlz147bgbsqVA3
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  bH6EuKLaGd0QSfAfp0ELqk0iz/K/TSIdH2W3UThB9setbLbYcmALDZ6ugUSqxHcn
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  8P9W8FUOONS68+wERL4cBAQ97SJLgOkV5HWWDd2GmP8Odh8KPJ8yuMeUrwuuFJb4
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  pUsICfBSJrTrdDli97ocuutwgSKmDuocTk3Ble7qCHECgYEA/dyzt1TzXN+V3J6n
+  -----END CERTIFICATE-----
-  L/yOznsd6gYOwriKiugYnjM6RMsPBAdb2OdD6idtQQEBkL5LH5jNy+0yQco1oqoV
+  -----BEGIN CERTIFICATE-----
-  HxZeqpGvQKPjHPLWUDNgHa880p3aAIr+y0lb5HfXPUZJscGanodJg8zEo4/6o3lh
+  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  34mXRTXhqWt11DulIspTpJw4gckCgYEA8tIJchWeqkkQff7l8wlLQFcMjMmBqtDO
+  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
-  UDMWWo3OV/MmKNGpyXFnRoyZf5MY03CZ7vskMmGYrG4UoRDhkX1uFjccFqTTtt8B
+  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
-  gEbY6DwNpckKLoyO99vwqeH2ZH6K2PsHJxBPHW5MyHE+mqyQP1peONisI73ke2MD
+  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
-  HTaSiwVGWV8CgYEA4bp3StMMuk5NESk5fB/UU6GBze+o/FffSPhru2/NphHwviJU
+  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
-  9x9ccj6wlRZx7+RlJClZBLVa9Mj6vDMEKOpZLs3vyUhwz/LVweaM1phVOuoFSGpP
+  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
-  eS83uIUfLGrtaFPASqn9ImbXiqChuu5ZqszLZ00r5NuaoCaRBchma35FeJECgYEA
+  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
-  kEAQlnKbiIPRRVhpGMFbsARGk1ieLHDRL7m5vN/jRkJPWA599ArnlHSwN6aWJ/4L
+  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
-  pHoTnc522XCn1qtlpX3DKXVhvV372/aNOLxd3VDXtrZA0zhzMnG5feKb8kVujMpM
+  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
-  DHvW1CATgzwrOc3r/4ba1KB7WtxTYK2ISxGBaw8eJLcCgYEAr12H7C22rKbySQdr
+  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
-  unCbkFS1U3D5rQrpneWzN3DkFySSMOwref/l1VJMJh+F5p2s8VQxlC14+rmNh3o3
+  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-  pLK+jHoGZ00q15vsH4xKTUTHgyUOQ8e/FsrY9pwadT6iw529B6C+ZNzqRnRGfbZr
-  teOUBdScIHhUmQDkNALjEmOyYNI=
  -----END CERTIFICATE-----
--- a/stack/nbd.cfg
+++ b/stack/nbd.cfg
@@ -37,6 +37,8 @@ version = 3
 eggs = slapos.libnetworkcache
 [nbdserver]
+# XXX-Cedric : use official tarball from kvm website
+#              (new kvm code does not seem to need special patch)
 recipe = hexagonit.recipe.cmmi
 path = ${nbdserversource:location}/
 configure-options =