buildpackages: install rsync

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 3e7f311b761d584866614a5227d34d4732de94b3)

diff --git a/tasks/buildpackages/Makefile b/tasks/buildpackages/Makefile
index 47aac2893889db86c756922a3ce34382d1a958cf..7bacbe4eb7881a79b4fed1bf6a62c1fffad5cbca 100644 (file)
--- a/tasks/buildpackages/Makefile
+++ b/tasks/buildpackages/Makefile
@@ -36,7 +36,7 @@ flock-${PKG_REPO}:
        ip=$(call get_ip,${PKG_REPO}) ; \
        for delay in 1 2 4 8 8 8 8 8 8 8 8 8 16 16 16 16 16 32 32 32 64 128 256 512 ; do if ssh -o 'ConnectTimeout=3' $$ip bash -c '"grep -q READYTORUN /var/log/cloud-init*.log"' ; then break ; else sleep $$delay ; fi ; done ; \
        ssh $$ip sudo apt-get update ; \
-       ssh $$ip sudo apt-get install -y nginx && \
+       ssh $$ip sudo apt-get install -y nginx rsync && \
        ssh $$ip sudo chown -R ubuntu /usr/share/nginx/html && \
        ssh $$ip sudo rm /usr/share/nginx/html/\* && \
        ssh $$ip sudo perl -pi -e '"s|location / {|location / { autoindex on;|"' /etc/nginx/sites-available/default && \

diff --git a/tasks/buildpackages/make-deb.sh b/tasks/buildpackages/make-deb.sh
index 075f1a45d44b68c0db912548d7d2b1c9f595fa90..9517839b6bc1cce607d3ae7b0921558888668d1c 100755 (executable)
--- a/tasks/buildpackages/make-deb.sh
+++ b/tasks/buildpackages/make-deb.sh
@@ -134,6 +134,7 @@ EOF
     link_same $codename/$base/ref $ceph_dir $sha1
     if test "$gitbuilder_host" ; then
         cd $codename
+        sudo apt-get install -y rsync
         RSYNC_RSH='ssh -o StrictHostKeyChecking=false' rsync -av $base/ $gitbuilder_host:/usr/share/nginx/html/$base/
     fi
 }