use simplifications of lamp template for lifetype, add patch for mysql5...

use simplifications of lamp template for lifetype, add patch for mysql5 compatibilities and remove wizard after installation

software/lifetype/instance.cfg

@@ -7,11 +7,14 @@ 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
 mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
 mysqld_binary = ${mariadb:location}/libexec/mysqld
+
+delete = wizard.php
+table_name = blogs
+constraint = `id`>0
\ No newline at end of file

software/lifetype/software.cfg

@@ -7,32 +7,30 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
+  lifetype-patch
+  patch
   
 extends =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/lamp.cfg
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp:/stack/shacache-client.cfg
+  ../../stack/lamp.cfg
 
-allow-hosts += alastairs-place.net
+[lifetype-patch]
+recipe = slapos.recipe.download
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp-mayoro:/software/lifetype/lifetype_for_mysql5.patch
+md5sum = c52bea61ea452b9f3caa82426a5819e5
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = lifetype_for_mysql5.patch
 
 [application]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = http://garr.dl.sourceforge.net/project/lifetype/lifetype/lifetype-1.2.11/lifetype-1.2.11.tar.bz2
-#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 = 50e329dfdb6c5876c0600abe30a379fb
+strip-top-level-dir = true
 
-[application-template]
-recipe = slapos.recipe.download
-url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/lifetype/template/config.properties.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 = lifetype-1.2.11/config/config.properties.php
+[patch]
+recipe = iw.recipe.cmd
+on_install = true
+on_update = true
+cmds= patch -d ${application:location} -p1 < ${lifetype-patch:location}/${lifetype-patch:filename}
 
 [instance-recipe]
 egg = slapos.cookbook
@@ -48,22 +46,7 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.31
-
-[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
-
+eggs =
+    ${mysql-python:egg}
+    ${instance-recipe:egg}
+    slapos.toolbox[lampconfigure]