From c041805dcfc7907a4d129bb0e89ddbe764c5f0d8 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Tue, 2 Dec 2014 02:17:19 +0200
Subject: wip/build.ant: deb pkg, local/remote deploy

---
 build.ant | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 build.ant

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
new file mode 100644
index 00000000..51767b89
--- /dev/null
+++ b/build.ant
@@ -0,0 +1,103 @@
+<!-- 
+ Rhizi build targets
+-->
+<project name="rhizi-server" default="pkg-deb">
+
+   <macrodef name="rsync">
+      <attribute name="src" />
+      <attribute name="dst" />
+      <sequential>
+         <exec dir="${basedir}" executable="/usr/bin/rsync">
+            <arg value="-avz" />
+            <arg value="@{src}" />
+            <arg value="@{dst}" />
+         </exec>
+      </sequential>
+   </macrodef>
+
+   <property name="pkg_name" value="rhizi-server" />
+   <property name="pkg_version" value="0.1.0" />
+   <property name="buildDir" value="build/${pkg_name}-${pkg_version}" />
+
+   <fail unless="rzRootDir"
+         message="'rzRootDir' arg missing - must point to root rhizi code dir" />
+
+   <tstamp>
+      <format property="versionQualifier" pattern="yyyyMMddHHmm" />
+   </tstamp>
+
+   <target name="clean" description="remove all work folders">
+      <delete dir="dist" />
+      <delete dir="build" />
+      <delete dir="deploy-local" />
+   </target>
+
+   <target name="deploy-local" description="locally deploy webapp">
+      <local name="src__client" />
+      <local name="src__server" />
+      <local name="dst" />
+
+      <property name="src__client" value="${rzRootDir}/rhizi-client" />
+      <property name="src__server" value="${rzRootDir}/rhizi-server" />
+      <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
+
+      <parallel>
+         <!-- [!] trailing '/' critical -->
+         <rsync src="${src__client}/src/" dst="${dst}/static" />
+         <rsync src="${src__client}/res" dst="${dst}/static" />
+         <rsync src="${src__client}/lib" dst="${dst}/static" />
+
+         <rsync src="${src__client}/index.html" dst="${dst}/templates/" />
+
+         <rsync src="${src__server}/src-py" dst="${dst}" />
+         <rsync src="${src__server}/res/etc" dst="${dst}" />
+         <rsync src="${src__server}/res/templates/" dst="${dst}/templates" />
+      </parallel>
+
+   </target>
+
+   <target name="deploy-remote" depends="deploy-local">
+
+      <local name="src" />
+      <local name="dstPath" />
+      <local name="dstServer" />
+      <property name="src" value="${rzRootDir}/rhizi-server/deploy-local" />
+      <property name="dstPath" value="/srv/www/rhizi/rhizi.net" />
+      <property name="dstServer" value="rz_0.unige.ch" />
+
+      <rsync src="${src}/" dst="root@${dstServer}:${dstPath}" />
+      <rsync src="${rzRootDir}/rhizi-server/res/etc/rhizi-server.production.conf"
+             dst="root@${dstServer}:/etc/rhizi/rhizi-server.conf" />
+      <rsync src="${src}/etc/htpasswd.db"
+             dst="root@${dstServer}:${dstPath}/../auth/" />
+   </target>
+
+   <target name="pkg-deb" depends="clean" description="package as .deb">
+      <mkdir dir="dist" />
+      <mkdir dir="${buildDir}" />
+
+      <exec dir="${basedir}" executable="/usr/bin/git">
+         <arg value="clone" />
+         <arg line="--depth 1" />
+         <arg value="file://${basedir}" />
+         <arg value="${buildDir}" />
+      </exec>
+
+      <copy todir="${buildDir}/debian">
+         <fileset dir="debian" />
+      </copy>
+
+      <exec dir="${buildDir}" executable="/usr/bin/debuild">
+         <arg value="-b" />
+         <arg value="-us" />
+         <arg value="-uc" />
+      </exec>
+   </target>
+
+   <target name="pkg-deb.list">
+      <exec dir="${buildDir}" executable="/usr/bin/dpkg">
+         <arg line="-c rhizi-server_0.1.0_amd64.deb" />
+      </exec>
+   </target>
+
+</project>
\ No newline at end of file
-- 
cgit v1.3.1


From 2162d9fc87d3fedbfc7e158646737203f91b70ca Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 3 Dec 2014 13:15:55 +0200
Subject: index.html: update deployment script

---
 build.ant | 2 --
 1 file changed, 2 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 51767b89..a7e1c0ed 100644
--- a/build.ant
+++ b/build.ant
@@ -47,8 +47,6 @@
          <rsync src="${src__client}/res" dst="${dst}/static" />
          <rsync src="${src__client}/lib" dst="${dst}/static" />
 
-         <rsync src="${src__client}/index.html" dst="${dst}/templates/" />
-
          <rsync src="${src__server}/src-py" dst="${dst}" />
          <rsync src="${src__server}/res/etc" dst="${dst}" />
          <rsync src="${src__server}/res/templates/" dst="${dst}/templates" />
-- 
cgit v1.3.1


From 8520c13b3c6471e61bb994cfb3621a6057d47803 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 3 Dec 2014 16:35:54 +0200
Subject: speedup deployment via <parallel>, update layout

---
 build.ant | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index a7e1c0ed..a9e8ad83 100644
--- a/build.ant
+++ b/build.ant
@@ -33,41 +33,51 @@
    </target>
 
    <target name="deploy-local" description="locally deploy webapp">
-      <local name="src__client" />
-      <local name="src__server" />
+      <local name="src_client" />
+      <local name="src_server" />
       <local name="dst" />
 
-      <property name="src__client" value="${rzRootDir}/rhizi-client" />
-      <property name="src__server" value="${rzRootDir}/rhizi-server" />
+      <property name="src_client" value="${rzRootDir}/rhizi-client" />
+      <property name="src_server" value="${rzRootDir}/rhizi-server" />
       <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
 
       <parallel>
          <!-- [!] trailing '/' critical -->
-         <rsync src="${src__client}/src/" dst="${dst}/static" />
-         <rsync src="${src__client}/res" dst="${dst}/static" />
-         <rsync src="${src__client}/lib" dst="${dst}/static" />
+         <rsync src="${src_client}/src/" dst="${dst}/static" />
+         <rsync src="${src_client}/res" dst="${dst}/static" />
+         <rsync src="${src_client}/lib" dst="${dst}/static" />
 
-         <rsync src="${src__server}/src-py" dst="${dst}" />
-         <rsync src="${src__server}/res/etc" dst="${dst}" />
-         <rsync src="${src__server}/res/templates/" dst="${dst}/templates" />
+         <rsync src="${src_server}/src-py" dst="${dst}" />
+         <rsync src="${src_server}/res/etc" dst="${dst}" />
+         <rsync src="${src_server}/res/templates/" dst="${dst}/templates" />
       </parallel>
 
    </target>
 
    <target name="deploy-remote" depends="deploy-local">
 
-      <local name="src" />
+      <local name="src_server" />
+      <local name="src_client" />
       <local name="dstPath" />
       <local name="dstServer" />
-      <property name="src" value="${rzRootDir}/rhizi-server/deploy-local" />
+      <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" />
 
-      <rsync src="${src}/" dst="root@${dstServer}:${dstPath}" />
-      <rsync src="${rzRootDir}/rhizi-server/res/etc/rhizi-server.production.conf"
-             dst="root@${dstServer}:/etc/rhizi/rhizi-server.conf" />
-      <rsync src="${src}/etc/htpasswd.db"
-             dst="root@${dstServer}:${dstPath}/../auth/" />
+      <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" />
+         <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/" />
+
+      </parallel>
    </target>
 
    <target name="pkg-deb" depends="clean" description="package as .deb">
-- 
cgit v1.3.1


From e7dd3f4cc2879ff9837a332d433fb93f0abddf99 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sat, 6 Dec 2014 21:29:46 +0200
Subject: build.ant: deploy code under /bin, fix local deploy missing dir issue

---
 build.ant | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index a9e8ad83..7edd9ede 100644
--- a/build.ant
+++ b/build.ant
@@ -29,10 +29,18 @@
    <target name="clean" description="remove all work folders">
       <delete dir="dist" />
       <delete dir="build" />
-      <delete dir="deploy-local" />
    </target>
 
-   <target name="deploy-local" description="locally deploy webapp">
+   <target name="deploy-local.clean">
+      <delete dir="deploy-local">
+         <include name="**/*" />
+      </delete>
+   </target>
+
+   <target name="deploy-local"
+           depends="deploy-local.clean"
+           description="locally deploy webapp">
+
       <local name="src_client" />
       <local name="src_server" />
       <local name="dst" />
@@ -41,13 +49,16 @@
       <property name="src_server" value="${rzRootDir}/rhizi-server" />
       <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
 
+      <mkdir dir="${dst}/bin" />
+      <mkdir dir="${dst}/static" />
+
       <parallel>
          <!-- [!] trailing '/' critical -->
          <rsync src="${src_client}/src/" dst="${dst}/static" />
          <rsync src="${src_client}/res" dst="${dst}/static" />
          <rsync src="${src_client}/lib" dst="${dst}/static" />
 
-         <rsync src="${src_server}/src-py" dst="${dst}" />
+         <rsync src="${src_server}/src-py/" dst="${dst}/bin" />
          <rsync src="${src_server}/res/etc" dst="${dst}" />
          <rsync src="${src_server}/res/templates/" dst="${dst}/templates" />
       </parallel>
-- 
cgit v1.3.1


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(-)

(limited to 'build.ant')

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


From 86de2ba2b7c5a1b37c328a7fa2e88cad6af87255 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 10 Dec 2014 15:24:18 +0200
Subject: symlink against src-py during deploy-local

---
 build.ant | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index ec17c283..0b973df3 100644
--- a/build.ant
+++ b/build.ant
@@ -35,7 +35,7 @@
    </target>
 
    <target name="deploy-local.clean">
-      <delete dir="deploy-local">
+      <delete dir="deploy-local" followsymlinks="false">
          <include name="**/*" />
       </delete>
    </target>
@@ -52,7 +52,6 @@
       <property name="src_server" value="${rzRootDir}/rhizi-server" />
       <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
 
-      <mkdir dir="${dst}/bin" />
       <mkdir dir="${dst}/static" />
 
       <parallel>
@@ -61,7 +60,10 @@
          <rsync src="${src_client}/res" dst="${dst}/static" />
          <rsync src="${src_client}/lib" dst="${dst}/static" />
 
-         <rsync src="${src_server}/src-py/" dst="${dst}/bin" />
+         <exec executable="/bin/ln">
+            <arg line="-rs -T ${src_server}/src-py ${dst}/bin" />
+         </exec>
+
          <rsync src="${src_server}/res/etc" dst="${dst}" />
          <rsync src="${src_server}/res/templates/" dst="${dst}/templates" />
       </parallel>
@@ -81,7 +83,7 @@
 
       <rsync src="${src_server}/deploy-local/"
              dst="rsync://${dstServer}/${module}/" />
-   
+
       <parallel>
          <!-- apply production patches -->
          <rsync src="${src_server}/res/production-patch-set/rhizi-server.production.conf"
@@ -92,6 +94,11 @@
       </parallel>
    </target>
 
+   <target name="deploy-remote.htpasswd.db" description="manual invocation">
+      <rsync src="${src_server}/res/production-patch-set/htpasswd.db"
+             dst="root@rz_0.unige.ch:/srv/www/rhizi/auth/" />
+   </target>
+
    <target name="pkg-deb" depends="clean" description="package as .deb">
       <mkdir dir="dist" />
       <mkdir dir="${buildDir}" />
-- 
cgit v1.3.1


From 8b624ffc49de7e8d94dcaeef171d52543b5cd7c9 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 14 Dec 2014 22:38:15 +0200
Subject: rsync macro doc

---
 build.ant | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 0b973df3..609b72e1 100644
--- a/build.ant
+++ b/build.ant
@@ -3,20 +3,21 @@
 -->
 <project name="rhizi-server" default="pkg-deb">
 
-   <macrodef name="rsync">
-      <attribute name="src" />
-      <attribute name="dst" />
-      <sequential>
-         <exec dir="${basedir}" executable="/usr/bin/rsync">
-            <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>
+<macrodef name="rsync">
+   <attribute name="src" />
+   <attribute name="dst" />
+   <attribute name="extraOpts" default="" />
+   <sequential>
+      <exec dir="${basedir}" executable="/usr/bin/rsync" >
+         <arg value="@{src}" />
+         <arg value="@{dst}" />
+
+         <!-- note: RSYNC_CONNECT_PROG has not effect when dst is local dir path -->
+         <env key="RSYNC_CONNECT_PROG"
+              value="ssh root@%H nc 127.0.0.1 873" />
+      </exec>
+   </sequential>
+</macrodef>
 
    <property name="pkg_name" value="rhizi-server" />
    <property name="pkg_version" value="0.1.0" />
-- 
cgit v1.3.1


From 0da7ad00971fefd9718dc2d963ba04f577914016 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 14 Dec 2014 22:38:35 +0200
Subject: rsync macro: extraOpts arg

---
 build.ant | 1 +
 1 file changed, 1 insertion(+)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 609b72e1..9174d1d6 100644
--- a/build.ant
+++ b/build.ant
@@ -9,6 +9,7 @@
    <attribute name="extraOpts" default="" />
    <sequential>
       <exec dir="${basedir}" executable="/usr/bin/rsync" >
+         <arg line="-avz @{extraOpts}" />
          <arg value="@{src}" />
          <arg value="@{dst}" />
 
-- 
cgit v1.3.1


From 5aeaf4eb93fda3188f9ed90e2514f4a1459225d3 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 14 Dec 2014 22:38:54 +0200
Subject: global deployDirLocal prop

---
 build.ant | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 9174d1d6..6435e100 100644
--- a/build.ant
+++ b/build.ant
@@ -23,6 +23,8 @@
    <property name="pkg_name" value="rhizi-server" />
    <property name="pkg_version" value="0.1.0" />
    <property name="buildDir" value="build/${pkg_name}-${pkg_version}" />
+   <property name="deployDirLocal"
+             value="${rzRootDir}/rhizi-server/deploy-local" />
 
    <fail unless="rzRootDir"
          message="'rzRootDir' arg missing - must point to root rhizi code dir" />
@@ -52,7 +54,7 @@
 
       <property name="src_client" value="${rzRootDir}/rhizi-client" />
       <property name="src_server" value="${rzRootDir}/rhizi-server" />
-      <property name="dst" value="${rzRootDir}/rhizi-server/deploy-local" />
+      <property name="dst" value="${deployDirLocal}" />
 
       <mkdir dir="${dst}/static" />
 
-- 
cgit v1.3.1


From dde6ded2a4a95ee2d1c4eb4e0f813a36cd9d8103 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 14 Dec 2014 22:39:33 +0200
Subject: bin -> ../src-py symlink handling

---
 build.ant | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 6435e100..4d91e0eb 100644
--- a/build.ant
+++ b/build.ant
@@ -39,8 +39,12 @@
    </target>
 
    <target name="deploy-local.clean">
-      <delete dir="deploy-local" followsymlinks="false">
-         <include name="**/*" />
+      <!-- bin/ -> link: avoid specifying followsymlinks on the following delete task -->
+      <symlink action="delete" link="deploy-local/bin" />
+      <delete verbose="true" includeemptydirs="true">
+         <fileset dir="${deployDirLocal}"
+                  includes="**/*"
+                  defaultexcludes="false" />
       </delete>
    </target>
 
@@ -64,9 +68,10 @@
          <rsync src="${src_client}/res" dst="${dst}/static" />
          <rsync src="${src_client}/lib" dst="${dst}/static" />
 
-         <exec executable="/bin/ln">
-            <arg line="-rs -T ${src_server}/src-py ${dst}/bin" />
-         </exec>
+         <symlink action="single"
+                  overwrite="true"
+                  link="${dst}/bin"
+                  resource="${src_server}/src-py" />
 
          <rsync src="${src_server}/res/etc" dst="${dst}" />
          <rsync src="${src_server}/res/templates/" dst="${dst}/templates" />
@@ -85,7 +90,9 @@
       <property name="dstServer" value="rz_0.unige.ch" />
       <property name="module" value="rhizi.net" />
 
-      <rsync src="${src_server}/deploy-local/"
+      <!-- -l: traverse bin/ -> ../src-py link -->
+      <rsync src="${deployDirLocal}/"
+             extraopts="-lL"
              dst="rsync://${dstServer}/${module}/" />
 
       <parallel>
-- 
cgit v1.3.1