Merge remote-tracking branch 'origin/master' into lapp-resilient2

software/joomla/software.cfg

 [buildout]
-versions = versions
-
-
-  
 extends =
   ../../stack/lamp/buildout.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -16,7 +11,7 @@ strip-top-level-dir = false
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/database.xml-in
-md5sum = 6ae063318a251b70ae7d037e3ae375d6 
+md5sum = 6ae063318a251b70ae7d037e3ae375d6
 download-only = True
 filename = template.in
 mode = 0644
@@ -24,15 +19,3 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
  
 [application-configuration]
 location = installation/models/forms/database.xml
-
-[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/prestashop/software.cfg

@@ -16,7 +16,7 @@ extends =
 [application]
 recipe = slapos.recipe.build:download-unpacked
 url = http://www.prestashop.com/download/prestashop_1.4.5.1.zip
-md5sum = 3d19305d728f7e8a19f81f9f326b9383
+md5sum = 49197c04bcf9523ef9deb6d691615d84
   
 [instance-recipe]
 egg = slapos.cookbook