From e0cb1c5188935a0f60b4e71e8cae91c1a8f74831 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 12 Jul 2023 15:44:17 -0700 Subject: [PATCH] download: move centos items out of /srv/pub We had centos stream and altarches and centos linux under /srv/pub on external download servers. However, this breaks people who sync buffet or the like from them because they suddenly get centos content that they want to just get directly elsewhere. So, just move these up a leave so they are out of the buffet target and people who want them can get them elsewhere. Signed-off-by: Kevin Fenzi --- files/download/download-sync.cron.ib01 | 2 +- files/download/sync-up-centos.sh.cc-rdu01 | 6 +++--- files/download/sync-up-centos.sh.ib01 | 6 +++--- .../httpd/dl.fedoraproject.org/secondary.conf | 16 ++++++++++++++++ roles/rsyncd/templates/rsyncd.conf.download.j2 | 6 +++--- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/files/download/download-sync.cron.ib01 b/files/download/download-sync.cron.ib01 index b11b6b082c..b9bd80558d 100644 --- a/files/download/download-sync.cron.ib01 +++ b/files/download/download-sync.cron.ib01 @@ -1,4 +1,4 @@ # Run quick mirror fedora every 10minutes */10 * * * * root flock -n -E0 /tmp/download-sync -c '/root/quick-fedora-mirror/quick-fedora-mirror -c /root/quick-fedora-mirror/quick-fedora-mirror.conf' ## Need to run this to keep centos mirror up to date. -#00 1,7,13,19 * * * root /usr/local/bin/lock-wrapper sync-up-downloads "/usr/local/bin/sync-up-centos" +00 1,7,13,19 * * * root /usr/local/bin/lock-wrapper sync-up-downloads "/usr/local/bin/sync-up-centos" diff --git a/files/download/sync-up-centos.sh.cc-rdu01 b/files/download/sync-up-centos.sh.cc-rdu01 index 8a5aea6b1d..380f54671c 100644 --- a/files/download/sync-up-centos.sh.cc-rdu01 +++ b/files/download/sync-up-centos.sh.cc-rdu01 @@ -12,17 +12,17 @@ EPL_EXCLUDES="" FED_EXCLUDES="" # CentOS -${RSYNC} ${RS_OPT} ${RS_DEADLY} master-1.centos.org::CentOS-community-cage/centos/ /srv/pub/centos/ | tail -n2 | logger -p local0.notice -t rsync_centos +${RSYNC} ${RS_OPT} ${RS_DEADLY} master-1.centos.org::CentOS-community-cage/centos/ /srv/centos/ | tail -n2 | logger -p local0.notice -t rsync_centos if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS" fi # CentOS-altarch -${RSYNC} ${RS_OPT} ${RS_DEADLY} master-1.centos.org::CentOS-community-cage/altarch/ /srv/pub/centos-altarch/ | tail -n2 | logger -p local0.notice -t rsync_centos_alt +${RSYNC} ${RS_OPT} ${RS_DEADLY} master-1.centos.org::CentOS-community-cage/altarch/ /srv/centos-altarch/ | tail -n2 | logger -p local0.notice -t rsync_centos_alt if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS-altarch" fi -${RSYNC} ${RS_OPT} ${RS_DEADLY} rsync.stream.centos.org::CentOS-Stream-All/ /srv/pub/centos-stream/ | tail -n2 | logger -p local0.notice -t rsync_centos_stream +${RSYNC} ${RS_OPT} ${RS_DEADLY} rsync.stream.centos.org::CentOS-Stream-All/ /srv/centos-stream/ | tail -n2 | logger -p local0.notice -t rsync_centos_stream if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS-stream" fi diff --git a/files/download/sync-up-centos.sh.ib01 b/files/download/sync-up-centos.sh.ib01 index 1a7fde7db6..b824e082fe 100644 --- a/files/download/sync-up-centos.sh.ib01 +++ b/files/download/sync-up-centos.sh.ib01 @@ -12,17 +12,17 @@ EPL_EXCLUDES="" FED_EXCLUDES="" # CentOS -${RSYNC} ${RS_OPT} ${RS_DEADLY} download-cc-rdu01.fedoraproject.org::centos/ /srv/pub/centos/ | tail -n2 | logger -p local0.notice -t rsync_centos +${RSYNC} ${RS_OPT} ${RS_DEADLY} download-cc-rdu01.fedoraproject.org::centos/ /srv/centos/ | tail -n2 | logger -p local0.notice -t rsync_centos if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS" fi # CentOS-altarch -${RSYNC} ${RS_OPT} ${RS_DEADLY} download-cc-rdu01.fedoraproject.org::centos-altarch/ /srv/pub/centos-altarch/ | tail -n2 | logger -p local0.notice -t rsync_centos_alt +${RSYNC} ${RS_OPT} ${RS_DEADLY} download-cc-rdu01.fedoraproject.org::centos-altarch/ /srv/centos-altarch/ | tail -n2 | logger -p local0.notice -t rsync_centos_alt if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS-altarch" fi -${RSYNC} ${RS_OPT} ${RS_DEADLY} rsync.stream.centos.org::CentOS-Stream-All/ /srv/pub/centos-stream/ | tail -n2 | logger -p local0.notice -t rsync_centos_stream +${RSYNC} ${RS_OPT} ${RS_DEADLY} rsync.stream.centos.org::CentOS-Stream-All/ /srv/centos-stream/ | tail -n2 | logger -p local0.notice -t rsync_centos_stream if [[ $? -ne 0 ]]; then echo "Unable to finish sync to CentOS-stream" fi diff --git a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf index 7f0f3695ae..79bc6ce268 100644 --- a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf +++ b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf @@ -50,6 +50,22 @@ DocumentRoot /srv/web + + HeaderName /HEADER.html + ReadmeName /FOOTER.html + Options Indexes FollowSymLinks + + # Apache 2.4 + Require all granted + IndexOptions NameWidth=* FancyIndexing + + + # Apache 2.2 + Order allow,deny + Allow from all + + + HeaderName HEADER.html ReadmeName README diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2 index 6d223a2d28..df1e9df940 100644 --- a/roles/rsyncd/templates/rsyncd.conf.download.j2 +++ b/roles/rsyncd/templates/rsyncd.conf.download.j2 @@ -167,19 +167,19 @@ refuse options = checksum # For RDU-CC usage [centos] comment = CentOS Mirror - path = /srv/pub/centos + path = /srv/centos list = yes # For RDU-CC usage [centos-altarch] comment = CentOS Mirror Altarch - path = /srv/pub/centos-altarch + path = /srv/centos-altarch list = yes # For RDU-CC usage [centos-stream] comment = CentOS Mirror Stream9 - path = /srv/pub/centos-stream + path = /srv/centos-stream list = yes {% endif %}