From 3e7f311b761d584866614a5227d34d4732de94b3 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 29 Mar 2016 15:09:23 +0200 Subject: [PATCH] buildpackages: install rsync Signed-off-by: Loic Dachary --- tasks/buildpackages/Makefile | 2 +- tasks/buildpackages/make-deb.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/buildpackages/Makefile b/tasks/buildpackages/Makefile index 0dcc29ca581..bb508f68ed0 100644 --- 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 075f1a45d44..9517839b6bc 100755 --- 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 } -- 2.39.5