From 1a69c6bd50c0e776a8fc652e7cbfbb5eebec1faf Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 29 May 2020 12:16:47 -0400 Subject: [PATCH] have the docs rsync remove excluded files in case they came over. should remove garbage from proxies --- roles/fedora-docs/proxy/files/docs-rsync | 4 ++-- roles/fedora-docs/proxy/files/docs-rsync.stg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/fedora-docs/proxy/files/docs-rsync b/roles/fedora-docs/proxy/files/docs-rsync index 4882a8d180..6e4a40bae2 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync +++ b/roles/fedora-docs/proxy/files/docs-rsync @@ -1,7 +1,7 @@ #!/bin/sh -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ --exclude=ar.building/ sundries01::docs/ /srv/web/docs.fedoraproject.org/ -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ --exclude=ar.building/ sundries01::docs-redirects/ /srv/web/docs-redirects/ +/usr/bin/rsync -aSHPv --delete --delete-excluded --exclude=.git/objects/ --exclude='*-building/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync -aSHPv --delete --delete-excluded --exclude=.git/objects/ --exclude='*-building/' sundries01::docs-redirects/ /srv/web/docs-redirects/ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 diff --git a/roles/fedora-docs/proxy/files/docs-rsync.stg b/roles/fedora-docs/proxy/files/docs-rsync.stg index 9cfcc8d913..3410eb7c00 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync.stg +++ b/roles/fedora-docs/proxy/files/docs-rsync.stg @@ -1,7 +1,7 @@ #!/bin/sh -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ --exclude=ar.building/ sundries01::docs/ /srv/web/docs.fedoraproject.org/ -/usr/bin/rsync -aSHPv --delete --exclude=.git/objects/ --exclude=ar.building/ sundries01::docs-redirects/ /srv/web/docs-redirects/ +/usr/bin/rsync -aSHPv --delete --delete-excluded --exclude=.git/objects/ --exclude='*-building/' sundries01::docs/ /srv/web/docs.fedoraproject.org/ +/usr/bin/rsync -aSHPv --delete --delete-excluded --exclude=.git/objects/ --exclude='*-building/' sundries01::docs-redirects/ /srv/web/docs-redirects/ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130