From 51c015596f92484dd35228f30621a05eb677d03d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 11 May 2021 16:32:30 -0700 Subject: [PATCH] proxies: do not serve out .git dirs anywhere, no need Signed-off-by: Kevin Fenzi --- roles/developer/website/files/cron-sync-developer | 2 +- roles/fedora-budget/proxy/files/cron-sync-budget | 2 +- roles/fedora-docs/proxy/files/docs-rsync | 2 +- roles/fedora-docs/proxy/files/docs-rsync.stg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/developer/website/files/cron-sync-developer b/roles/developer/website/files/cron-sync-developer index 4b606af29b..4b20191e21 100644 --- a/roles/developer/website/files/cron-sync-developer +++ b/roles/developer/website/files/cron-sync-developer @@ -1 +1 @@ -30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::developer.fedoraproject.org/ /srv/web/developer.fedoraproject.org/ +30 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group --delete-excluded --exclude='.git*' sundries01::developer.fedoraproject.org/ /srv/web/developer.fedoraproject.org/ diff --git a/roles/fedora-budget/proxy/files/cron-sync-budget b/roles/fedora-budget/proxy/files/cron-sync-budget index ab327291b5..5c71bd6c02 100644 --- a/roles/fedora-budget/proxy/files/cron-sync-budget +++ b/roles/fedora-budget/proxy/files/cron-sync-budget @@ -1 +1 @@ -25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::budget.fedoraproject.org/ /srv/web/budget.fedoraproject.org/ +25 * * * * root /usr/bin/rsync --delete -a --no-owner --no-group --delete-excluded --exclude='.git*' sundries01::budget.fedoraproject.org/ /srv/web/budget.fedoraproject.org/ diff --git a/roles/fedora-docs/proxy/files/docs-rsync b/roles/fedora-docs/proxy/files/docs-rsync index 6ab7f1b42c..bd4fba59b3 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync +++ b/roles/fedora-docs/proxy/files/docs-rsync @@ -6,4 +6,4 @@ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -rsync --timeout 300 -aH --delete --delete-after --exclude=.git /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ +rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ diff --git a/roles/fedora-docs/proxy/files/docs-rsync.stg b/roles/fedora-docs/proxy/files/docs-rsync.stg index 3f268344cf..fc29c82547 100755 --- a/roles/fedora-docs/proxy/files/docs-rsync.stg +++ b/roles/fedora-docs/proxy/files/docs-rsync.stg @@ -6,4 +6,4 @@ # build the combined docs tree. # See https://pagure.io/fedora-infrastructure/issue/7130 -rsync -aH --delete /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/ +rsync --timeout 300 -aH --delete --delete-after --delete-excluded --exclude='.git*' /srv/web/docs.fedoraproject.org/ /srv/web/docs-redirects/ /srv/web/docs-old.fedoraproject.org/public_html/ /srv/web/docs-combined/