From 49ba41bfe26d78a8009634f1ec4be415d7342589 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras <evangelos@foutrelis.com> Date: Thu, 29 Jul 2021 11:40:48 +0300 Subject: [PATCH] syncarchive: Tweak rsync options and drop temp dir This reflects the recent changes made to syncrepo. --- roles/syncarchive/files/syncarchive | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/syncarchive/files/syncarchive b/roles/syncarchive/files/syncarchive index e3d469b60..536f50c95 100755 --- a/roles/syncarchive/files/syncarchive +++ b/roles/syncarchive/files/syncarchive @@ -1,20 +1,18 @@ #!/bin/bash target="/srv/archive" -tmp="/srv/syncarchive-tmp" lock="/var/lock/syncarchive.lck" source_url='rsync://rsync.archlinux.org/archive' lastupdate_url='https://archive.archlinux.org/repos/last/lastupdate' [ ! -d "${target}" ] && mkdir -p "${target}" -[ ! -d "${tmp}" ] && mkdir -p "${tmp}" exec 9>"${lock}" flock -n 9 || exit rsync_cmd() { - local -a cmd=(rsync -rtlH --safe-links --delete-after ${VERBOSE} "--timeout=600" "--contimeout=60" -p \ - --delay-updates --no-motd "--temp-dir=${tmp}") + local -a cmd=(rsync -rlptH --safe-links --delete-delay --delay-updates + "--timeout=600" "--contimeout=60" --no-motd) if stty &>/dev/null; then cmd+=(-h -v --progress) -- GitLab