Merge branch 'syncrepo-updates' into 'master'

syncrepo tweaks now that rsync has fixed the stale .~tmp~ issue

See merge request !471

roles/syncarchive/files/syncarchive

 #!/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)

roles/syncrepo/files/syncrepo

@@ -38,11 +38,6 @@
 # Directory where the repo is stored locally. Example: /srv/repo
 target="/srv/ftp"
 
-# Directory where files are downloaded to before being moved in place.
-# This should be on the same filesystem as $target, but not a subdirectory of $target.
-# Example: /srv/tmp
-tmp="/srv/syncrepo-tmp"
-
 # Lockfile path
 lock="/var/lock/syncrepo.lck"
 
@@ -66,17 +61,13 @@ lastupdate_url='https://rsync.archlinux.org/lastupdate'
 #### END CONFIG
 
 [ ! -d "${target}" ] && mkdir -p "${target}"
-[ ! -d "${tmp}" ] && mkdir -p "${tmp}"
-
-# Cleanup any temporary files from old run that might remain.
-find "${target}" -name '.~tmp~' -exec rm -r {} +
 
 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)

roles/syncrepo/files/syncrepo-template.sh

@@ -29,11 +29,6 @@
 # Directory where the repo is stored locally. Example: /srv/repo
 target=""
 
-# Directory where files are downloaded to before being moved in place.
-# This should be on the same filesystem as $target, but not a subdirectory of $target.
-# Example: /srv/tmp
-tmp=""
-
 # Lockfile path
 lock="/var/lock/syncrepo.lck"
 
@@ -50,24 +45,25 @@ bwlimit=0
 source_url=''
 
 # An HTTP(S) URL pointing to the 'lastupdate' file on your chosen mirror.
-# If you are a tier 1 mirror use: http://rsync.archlinux.org/lastupdate
+# If you are a tier 1 mirror use: https://rsync.archlinux.org/lastupdate
 # Otherwise use the HTTP(S) URL from your chosen mirror.
 lastupdate_url=''
 
 #### END CONFIG
 
 [ ! -d "${target}" ] && mkdir -p "${target}"
-[ ! -d "${tmp}" ] && mkdir -p "${tmp}"
 
 exec 9>"${lock}"
 flock -n 9 || exit
 
 # Cleanup any temporary files from old run that might remain.
+# Note: You can skip this if you have rsync newer than 3.2.3
+# not affected by https://github.com/WayneD/rsync/issues/192
 find "${target}" -name '.~tmp~' -exec rm -r {} +
 
 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)