From 856535acb97baae1d34feb3b1bc3564e74314073 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Mon, 8 Dec 2014 18:09:25 +0200
Subject: fix race condition

---
 build.ant | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/build.ant b/build.ant
index 7edd9ede..ec17c283 100644
--- a/build.ant
+++ b/build.ant
@@ -11,6 +11,9 @@
             <arg value="-avz" />
             <arg value="@{src}" />
             <arg value="@{dst}" />
+
+            <env key="RSYNC_CONNECT_PROG"
+                 value="ssh root@%H nc 127.0.0.1 873" />
          </exec>
       </sequential>
    </macrodef>
@@ -69,24 +72,22 @@
 
       <local name="src_server" />
       <local name="src_client" />
-      <local name="dstPath" />
       <local name="dstServer" />
+      <local name="module" />
       <property name="src_client" value="${rzRootDir}/rhizi-client" />
       <property name="src_server" value="${rzRootDir}/rhizi-server" />
-      <property name="dstPath" value="/srv/www/rhizi/rhizi.net" />
       <property name="dstServer" value="rz_0.unige.ch" />
+      <property name="module" value="rhizi.net" />
 
+      <rsync src="${src_server}/deploy-local/"
+             dst="rsync://${dstServer}/${module}/" />
+   
       <parallel>
-         <rsync src="${src_server}/deploy-local/"
-                dst="root@${dstServer}:${dstPath}" />
-
          <!-- apply production patches -->
          <rsync src="${src_server}/res/production-patch-set/rhizi-server.production.conf"
-                dst="root@${dstServer}:/etc/rhizi/rhizi-server.conf" />
+                dst="rsync://${dstServer}/${module}/etc/rhizi-server.conf" />
          <rsync src="${src_server}/res/production-patch-set/rz_config.js"
-                dst="root@${dstServer}:${dstPath}/static" />
-         <rsync src="${src_server}/res/production-patch-set/htpasswd.db"
-                dst="root@${dstServer}:${dstPath}/../auth/" />
+                dst="rsync://${dstServer}/${module}/static/" />
 
       </parallel>
    </target>
-- 
cgit v1.3.1