From 8a543cda9b72e7ea3598dfdafb601271c6aabfec Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Mon, 16 Apr 2012 06:21:53 +0000
Subject: [PATCH] use simplifications of lamp template for zenphoto

---
 software/zenphoto/instance.cfg |  1 -
 software/zenphoto/software.cfg | 21 +--------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/software/zenphoto/instance.cfg b/software/zenphoto/instance.cfg
index 1d8387327..f85a225d8 100644
--- a/software/zenphoto/instance.cfg
+++ b/software/zenphoto/instance.cfg
@@ -7,7 +7,6 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql
diff --git a/software/zenphoto/software.cfg b/software/zenphoto/software.cfg
index 4ae19caa1..f1a6db9ac 100644
--- a/software/zenphoto/software.cfg
+++ b/software/zenphoto/software.cfg
@@ -7,11 +7,9 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
 
 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
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -33,20 +31,3 @@ 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
-
-[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
-
-- 
2.30.9