From bff1f4d622c70258b8d98952a3b4645ed557e516 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 8 Nov 2018 00:47:37 +0000 Subject: [PATCH] Switch to letting rsync filter our overlaps in docs combined site. Right now we are doing 3 rsyncs one at a time, but this prevents us from deleting content that has disappeared from one of the first ones. So, switch to doing one rsync with multiple sources and let it sort out files that are now gone to be deleted in the target. Fixes ticket 7334. --- roles/fedora-docs/proxy/files/docs-rsync.stg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/fedora-docs/proxy/files/docs-rsync.stg b/roles/fedora-docs/proxy/files/docs-rsync.stg index c2a3f165a4..d4b390cf62 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync.stg +++ b/roles/fedora-docs/proxy/files/docs-rsync.stg @@ -6,6 +6,4 @@ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -/usr/bin/rsync -aH /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ -/usr/bin/rsync -aH /srv/web/docs-redirects/ /srv/web/docs-combined/ -/usr/bin/rsync -aH /srv/web/docs.fedoraproject.org/ /srv/web/docs-combined/ +rsync -aH --delete /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/