Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

download: move centos items out of /srv/pub

Browse source 
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 <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-07-12 15:44:17 -07:00
parent c8a5b75209
commit e0cb1c5188
5 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/download/download-sync.cron.ib01
View file

@ -1,4 +1,4 @@
# Run quick mirror fedora every 10minutes # 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' */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. ## 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"

6
files/download/sync-up-centos.sh.cc-rdu01
View file

@ -12,17 +12,17 @@ EPL_EXCLUDES=""
FED_EXCLUDES="" FED_EXCLUDES=""
# CentOS # 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS" echo "Unable to finish sync to CentOS"
fi fi
# CentOS-altarch # 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS-altarch" echo "Unable to finish sync to CentOS-altarch"
fi 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS-stream" echo "Unable to finish sync to CentOS-stream"
fi fi

6
files/download/sync-up-centos.sh.ib01
View file

@ -12,17 +12,17 @@ EPL_EXCLUDES=""
FED_EXCLUDES="" FED_EXCLUDES=""
# CentOS # 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS" echo "Unable to finish sync to CentOS"
fi fi
# CentOS-altarch # 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS-altarch" echo "Unable to finish sync to CentOS-altarch"
fi 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 if [[ $? -ne 0 ]]; then
echo "Unable to finish sync to CentOS-stream" echo "Unable to finish sync to CentOS-stream"
fi fi

16
roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
View file

@ -50,6 +50,22 @@ DocumentRoot /srv/web
</IfModule> </IfModule>
</Directory> </Directory>
<Directory /srv/centos*>
HeaderName /HEADER.html
ReadmeName /FOOTER.html
Options Indexes FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
IndexOptions NameWidth=* FancyIndexing
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
</Directory>
<Directory /srv/pub/alt> <Directory /srv/pub/alt>
HeaderName HEADER.html HeaderName HEADER.html
ReadmeName README ReadmeName README

6
roles/rsyncd/templates/rsyncd.conf.download.j2
View file

@ -167,19 +167,19 @@ refuse options = checksum
# For RDU-CC usage # For RDU-CC usage
[centos] [centos]
comment = CentOS Mirror comment = CentOS Mirror
path = /srv/pub/centos path = /srv/centos
list = yes list = yes
# For RDU-CC usage # For RDU-CC usage
[centos-altarch] [centos-altarch]
comment = CentOS Mirror Altarch comment = CentOS Mirror Altarch
path = /srv/pub/centos-altarch path = /srv/centos-altarch
list = yes list = yes
# For RDU-CC usage # For RDU-CC usage
[centos-stream] [centos-stream]
comment = CentOS Mirror Stream9 comment = CentOS Mirror Stream9
path = /srv/pub/centos-stream path = /srv/centos-stream
list = yes list = yes
{% endif %} {% endif %}