Remove useless part and update application part.

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

software/MediaWiki/software.cfg

@@ -19,35 +19,26 @@ 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
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [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

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

software/SilverStripe/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/cmsmadesimple/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
-#If provided tarball does not contain top directory, option shall be changed to false
-strip-top-level-dir = false
+md5sum = b018842f195a20e50359b18c585f4d64
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/coppermine/software.cfg

@@ -14,16 +14,19 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [application-template]
 recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/coppermine.inc.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
+url = ${:_profile_base_location_}/template/coppermine.inc.php.in
+md5sum = c97345b7f3c060b825e1925e2be3c2c1
 download-only = True
 filename = template.in
 mode = 0644
@@ -64,4 +67,3 @@ download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
 stop-on-error = True
-

software/dotclear/software.cfg

@@ -14,16 +14,19 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [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

software/dotproject/software.cfg

@@ -14,23 +14,26 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [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

software/drupal/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/eSKUeL/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/ezpublish/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/joomla/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/lamp-template/software.cfg

@@ -14,11 +14,14 @@ extends =
   http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
+md5sum = Student may put here md5sum of this file, this is good idea
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [application-template]
 recipe = slapos.recipe.download
@@ -47,7 +50,8 @@ mode = 0644
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
-eggs = ${instance-recipe:egg}
+eggs = 
+  ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout

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

software/magento/software.cfg

@@ -13,23 +13,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [instance-recipe]
 egg = slapos.cookbook

software/net2ftp/software.cfg

@@ -25,16 +25,17 @@ script =
   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
 
 [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

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

software/openX/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/os-commerce/software.cfg

@@ -22,18 +22,6 @@ script =
   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

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}
-configuration = ${application-configuration:location}
+lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

software/phpbb/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [instance-recipe]
 egg = slapos.cookbook
@@ -47,7 +38,10 @@ 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

software/phpmyadmin/software.cfg

@@ -21,9 +21,14 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [application-template]
 recipe = slapos.recipe.download
@@ -41,24 +46,32 @@ location = config.inc.php
 egg = slapos.cookbook
 module = lamp.simple
 
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+#md5sum = Student shall put md5 of instance.cfg here
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]
-slapos.cookbook = 0.12
-
-# 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
-
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
-plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-005
+zc.buildout = 1.5.3-dev-SlapOS-010
+
+[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

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

software/pimcore/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 url = http://www.pimcore.org/download/pimcore-latest.zip
-md5sum = 58cfa935ed308476b95cf364af7719c3
-#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
+md5sum = 5cc0351fb01bca93f384071bff69be2e
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/piwigo/software.cfg

@@ -14,23 +14,26 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [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

software/piwigo/template/piwigo.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;
+$conf['dblayer'] = 'mysql';
+$conf['db_base'] = '%(mysql_database)s';
+$conf['db_user'] = '%(mysql_user)s';
+$conf['db_password'] = '%(mysql_password)s';
+$conf['db_host'] = '%(mysql_host)s';
 
-/* 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'] = '';
+$prefixeTable = 'piwigo_';
+
+define('PHPWG_INSTALLED', true);
+define('PWG_CHARSET', 'utf-8');
+define('DB_CHARSET', 'utf8');
+define('DB_COLLATE', '');
 
 ?>

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

software/piwik/software.cfg

@@ -17,24 +17,12 @@ extends =
 [application]
 recipe = slapos.recipe.build
 url = http://piwik.org/latest.zip
-md5sum = fd16c7a15573c93feefd1dcba3ca40ba
+md5sum = 04c5dc7f595adce4d68be9f94bbb140c
 script =
   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

software/prestashop/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

software/punbb/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [application-template]
 recipe = slapos.recipe.download

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 */
-$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'] = '';
+$db_type = 'mysqli';
+$db_host = '%(mysql_host)s';
+$db_name = '%(mysql_database)s';
+$db_username = '%(mysql_user)s';
+$db_password = '%(mysql_password)s';
+$db_prefix = 'pbb_';
+$p_connect = false;
 
-?>
+$base_url = 'http://webrunner:9080';
+
+$cookie_name = 'forum_cookie_173f50';
+$cookie_domain = '';
+$cookie_path = '/';
+$cookie_secure = 0;
+
+define('FORUM', 1);

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

software/simpleMachineForum/software.cfg

@@ -15,23 +15,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/spip/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/statusnet/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook
@@ -52,7 +43,6 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.30
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/sugar-crm/software.cfg

@@ -14,11 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
-url = http://dl.sugarforge.org/sugarcrm/1SugarCE6.4.0/SugarCE6.4.0/SugarCE-6.4.0beta1.zip
-md5sum = 6263a4f457df7ec2dc7ce2e877df95ed
-#If provided tarball does not contain top directory, option shall be changed to false
-#strip-top-level-dir = true
+recipe = slapos.recipe.build
+url = http://www.sugarforge.org/frs/download.php/8558/SugarCE-6.3.0RC3.zip
+md5sum = ff4cf7c6f673f9f3f6e082c62736f628
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
 
 [instance-recipe]
 egg = slapos.cookbook

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

software/tiki/software.cfg

@@ -14,23 +14,14 @@ extends =
   ../../stack/shacache-client.cfg
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build
 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
+script =
+  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, "${buildout:parts-directory}/${:_buildout_section_name_}")
   
 [instance-recipe]
 egg = slapos.cookbook

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

software/xoops/software.cfg

@@ -22,18 +22,6 @@ script =
   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