From 5e4449f786c772362be7c12d19cf6355e48a015d Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Tue, 2 Jul 2013 11:59:51 +0200
Subject: [PATCH] use shorter 'home' instead of 'zimbra-home'

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

diff --git a/software/zimbra/buildout.cfg b/software/zimbra/buildout.cfg
index 86d4a4ef8..5fc0ce4b0 100644
--- a/software/zimbra/buildout.cfg
+++ b/software/zimbra/buildout.cfg
@@ -335,7 +335,7 @@ input = inline:
 
 [directories]
 recipe = slapos.cookbook:mkdirectory
-zimbra-home = ${buildout:directory}/zimbra-home
+zimbra-home = ${buildout:directory}/home
 
 
 
@@ -348,7 +348,7 @@ PACKAGE_LIST = zimbra-core zimbra-store
 ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
 # attention: reference to the gitcloned part. we don't want it to be updated
 #PACKAGES = ${zimbra-sources:location}/ZimbraBuild/amd64
-PACKAGES = /home/marco/zbuild/amd64
+PACKAGES = ${buildout:directory}/amd64
 update_cmd = ${:install_cmd}
 install_cmd =
   rm -rf ${:ZIMBRA_HOME}
@@ -395,7 +395,7 @@ PACKAGE_LIST = zimbra-core zimbra-ldap
 ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
 # attention: reference to the gitcloned part. we don't want it to be updated
 #PACKAGES = ${zimbra-sources:location}/ZimbraBuild/amd64
-PACKAGES = /home/marco/zbuild/amd64
+PACKAGES = ${buildout:directory}/amd64
 update_cmd = ${:install_cmd}
 install_cmd =
   rm -rf ${:ZIMBRA_HOME}
@@ -447,7 +447,7 @@ PACKAGE_LIST = zimbra-core zimbra-mta
 ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
 # attention: reference to the gitcloned part. we don't want it to be updated
 #PACKAGES = ${zimbra-sources:location}/ZimbraBuild/amd64
-PACKAGES = /home/marco/zbuild/amd64
+PACKAGES = ${buildout:directory}/amd64
 update_cmd = ${:install_cmd}
 install_cmd =
   rm -rf ${:ZIMBRA_HOME}
@@ -517,7 +517,7 @@ install_cmd =
 
 
 # TODO
-#  ln -s /home/marco/zbuild/zimbra-home/postfix/conf/aliases /etc/aliases                                                                              
+#  ln -s home/postfix/conf/aliases /etc/aliases                                                                              
 
 # see also
 # http://www.zimbra.com/docs/ne/6.0.6/multi_server_install/multi-server_install.5.06.html
@@ -534,7 +534,7 @@ PACKAGE_LIST = zimbra-core zimbra-ldap zimbra-mta zimbra-store
 ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
 # attention: reference to the gitcloned part. we don't want it to be updated
 #PACKAGES = ${zimbra-sources:location}/ZimbraBuild/amd64
-PACKAGES = /home/marco/zbuild/amd64
+PACKAGES = ${buildout:directory}/amd64
 update_cmd = ${:install_cmd}
 install_cmd =
   rm -rf ${:ZIMBRA_HOME}
-- 
2.30.9