use simplifications of lamp template for pixelpost, add patch for mysql5 compatibilities

software/pixelpost/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/pixelpost/software.cfg

@@ -7,32 +7,29 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
+  pixelpost-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
-
-[application]
-recipe = hexagonit.recipe.download
-url = http://www.pixelpost.org/releases/latest.zip
-#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
-
-[application-template]
+[pixelpost-patch]
 recipe = slapos.recipe.download
-url = https://gitorious.org/~mayoro/slapos/yoro-slapos/blobs/raw/master/software/pixelpost/template/config.php.in
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
-filename = template.in
-mode = 0644
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/lamp-mayoro:/software/pixelpost/pixelpost_for_mysql5.patch
+md5sum = 100883ebbe4973883a710996b91f5d23
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = pixelpost_for_mysql5.patch
 
-[application-configuration]
-location = conf.inc.php
+[application]
+recipe = slapos.recipe.build:download-unpacked
+url = http://www.pixelpost.org/releases/pixelpost_v1.7.3.zip
+md5sum = 457f50312ca6dc682065ce3dbfda1a4f
+
+[patch]
+recipe = iw.recipe.cmd
+on_install = true
+on_update = true
+cmds= patch -d ${application:location} -p1 < ${pixelpost-patch:location}/${pixelpost-patch:filename}
 
 [instance-recipe]
 egg = slapos.cookbook
@@ -50,20 +47,3 @@ mode = 0644
 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
-