From 6cd9a2dca573065c97423b9e20fde44df0ee3327 Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Fri, 21 Jun 2013 11:54:28 +0200
Subject: [PATCH] zimbra: minimal software.cfg

---
 software/zimbra/software.cfg | 59 ++++++++----------------------------
 1 file changed, 12 insertions(+), 47 deletions(-)

diff --git a/software/zimbra/software.cfg b/software/zimbra/software.cfg
index 0ba7fa18c..3727a3bea 100644
--- a/software/zimbra/software.cfg
+++ b/software/zimbra/software.cfg
@@ -2,58 +2,23 @@
 
 extends =
   ../../stack/slapos.cfg
-  ../../component/git/buildout.cfg
 
 parts =
   slapos-cookbook
-  directories
-  environment
-  jdk-download
-  zimbra-sources
+  instance
+  junixsocket-hooks
 
-#  zimbra-build
 
+[instance]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/buildout.cfg
+filename = ${buildout:directory}/instance.cfg
+#md5sum = b501b73cdf50ddfb89b6bf3a096f05ea
 
-[jdk-download]
-recipe = plone.recipe.command
-archive-location = ${directories:jdk_download}
-web-dirname = 7u13-b20
-filename = jdk-7u13-linux-x64.tar.gz
-tar-dirname = jdk1.7.0_13
-stop-on-error = True
-update = true
-command =
-    wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" \
-        "http://download.oracle.com/otn-pub/java/jdk/${:web-dirname}/${:filename}" \
-        -O ${:archive-location}/jdk-7u13-linux-x64.tar.gz \
-    && cd ${:archive-location} \
-    && tar xfz ${:filename}
-
-
-[zimbra-sources]
-recipe = slapos.recipe.build:gitclone
-#repository = https://marco.mariani@bitbucket.org/marco.mariani/zimbra.git
-repository = /home/marco/src/zimbra
-branch = build2
-develop = True
-git-executable = ${git:location}/bin/git
-
-
-[zimbra-build]
-recipe = plone.recipe.command
-command = ${zimbra-sources:location}/ZimbraBuild/buildZCS.sh -t --tpoverride
-update-command = ${:command}
-stop-on-error = True
-environment = 
-
-[environment]
-recipe = collective.recipe.environment
-ZIMBRA_HOME = ${directories:zimbra_home}
-
-
-[directories]
-recipe = slapos.cookbook:mkdirectory
-zimbra_home = ${buildout:directory}/zimbra_home
-jdk_download = ${buildout:directory}/parts/jdk_download
 
+[junixsocket-hooks]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/junixsocket-hooks.py
+filename = ${buildout:directory}/junixsocket-hooks.py
+#md5sum = ed0ec6b0d558823a278d3617f09a4e12
 
-- 
2.30.9