fix: update fedora mirror list with upstream

Experiment with setting zchunk to false in DNF for Fedora. Fixes: #47
ben-grande · Apr 30, 2024 · e84959b · e84959b
1 parent 760fdd9
commit e84959b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/salt/sys-cacher/files/client/bin/apt-cacher-ng-repo b/salt/sys-cacher/files/client/bin/apt-cacher-ng-repo
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
 # SPDX-FileCopyrightText: 2015 - 2020 Marek Marczykowski-Gorecki <[email protected]>
+# SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
 #
 # SPDX-License-Identifier: GPL-2.0-only
 
@@ -90,7 +90,8 @@ set_proxy_os(){
     ## Fedora
 
     if test -w /etc/dnf/dnf.conf; then
-      set_proxy_marker /etc/dnf/dnf.conf "${proxy_conf}"
+      set_proxy_marker /etc/dnf/dnf.conf "zchunk=False
+${proxy_conf}"
     fi
 
     if test -n "${proxy_addr}"; then

diff --git a/salt/sys-cacher/files/server/conf/acng.conf b/salt/sys-cacher/files/server/conf/acng.conf
@@ -270,7 +270,7 @@ FollowIndexFileRemoval: 1
 # To see examples of the expected syntax, run: apt-cacher-ng -p debug=1
 #
 PfilePatternEx: .*yaml.gz$|.*fedora.*arch=x86_64$|.*f[0-9]+&arch=x86_64
-VfilePatternEx: .*fedora.*updateinfo.*xml.zck$|^/\?release=[0-9]+&arch=.*|.*/RPM-GPG-KEY.*|.*\?repo=fedora|.*pkg.tar.zst.sig
+VfilePatternEx: .*fedora.*updateinfo.*xml.zck$|^/\?release=[0-9]+&arch=.*|.*/RPM-GPG-KEY.*|.*\?repo=fedora|.*pkg.tar.zst.sig|.*archlinux.*sha256sums.txt|.*archlinux/iso.*tar.gz.sig
 # SPfilePatternEx:
 # SVfilePatternEx:
 # WfilePatternEx:

diff --git a/salt/sys-cacher/files/server/mirrors/fedora_mirrors b/salt/sys-cacher/files/server/mirrors/fedora_mirrors
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 unman <[email protected]>
+# SPDX-FileCopyrightText: 2022 - 2024 unman <[email protected]>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
@@ -15,11 +15,15 @@ http://divergentnetworks.mm.fcix.net/fedora/linux/
 http://dl.fedoraproject.org
 http://download-cc-rdu01.fedoraproject.org/pub/fedora/linux/
 http://download-ib01.fedoraproject.org/pub/fedora/linux
+http://download-ib01.fedoraproject.org/pub/fedora/linux/
 http://download.fedoraproject.org/pub/fedora/linux/
+http://fedora-archive.ip-connect.info/fedora/linux/
 http://fedora-mirror01.rbc.ru/pub/fedora/linux/
+http://fedora-mirror02.rbc.ru/pub/fedora/linux/
 http://fedora.blizoo.mk/fedora/linux/
 http://fedora.cu.be/linux/
 http://fedora.ip-connect.info/linux/
+http://fedora.ip-connect.vn.ua/linux/
 http://fedora.ipacct.com/fedora/linux/
 http://fedora.is.co.za/linux/
 http://fedora.mirror.angkasa.id/pub/fedora/linux/
@@ -28,16 +32,21 @@ http://fedora.mirror.digitalpacific.com.au/linux/
 http://fedora.mirror.garr.it
 http://fedora.mirror.iweb.com/linux/
 http://fedora.mirror.liteserver.nl
+http://fedora.mirror.liteserver.nl/
 http://fedora.mirror.root.lu/
 http://fedora.mirror.tn/pub/fedora/linux/
 http://fedora.mirror.wearetriple.com/linux/
 http://fedora.mirrors.pair.com/linux/
 http://fedora.mirrors.telekom.ro/pub/fedora/linux/
 http://fedora.mirrorservice.org/fedora/linux/
 http://fedora.tu-chemnitz.de/pub/linux/fedora/linux/
+http://forksystems.mm.fcix.net/fedora/linux/
 http://fr2.rpmfind.net/linux/fedora/linux/
 http://free.nchc.org.tw/fedora/linux/
+http://ftp-chi.osuosl.org/pub/fedora/linux
+http://ftp-chi.osuosl.org/pub/fedora/linux/
 http://ftp-nyc.osuosl.org
+http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/
 http://ftp-stud.hs-esslingen.de/pub/fedora/linux/
 http://ftp.acc.umu.se/mirror/fedora/linux/
 http://ftp.byfly.by/pub/fedoraproject.org/linux/
@@ -53,12 +62,14 @@ http://ftp.iij.ad.jp/pub/linux/Fedora/fedora/linux/
 http://ftp.ines.lug.ro/fedora/linux/
 http://ftp.jaist.ac.jp/pub/Linux/Fedora/
 http://ftp.linux.cz/pub/linux/fedora/linux/
+http://ftp.linux.org.tr
 http://ftp.linux.org.tr/fedora/updates
 http://ftp.lip6.fr/ftp/pub/linux/distributions/fedora/
 http://ftp.lysator.liu.se/pub/fedora/linux/
 http://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/
 http://ftp.ntua.gr/pub/linux/fedora/linux/
 http://ftp.otenet.gr/linux/
+http://ftp.otenet.gr/linux/fedora/linux/
 http://ftp.plusline.net/fedora/linux/
 http://ftp.tsukuba.wide.ad.jp/Linux/fedora/linux/
 http://ftp.tudelft.nl/download.fedora.redhat.com/linux/
@@ -89,25 +100,33 @@ http://mirror.csclub.uwaterloo.ca/fedora/linux/
 http://mirror.datacenter.by/pub/fedoraproject.org/linux/
 http://mirror.de.leaseweb.net/fedora/linux/
 http://mirror.dogado.de/fedora/linux/
+http://mirror.dst.ca/fedora-linux/fedora/linux/
 http://mirror.easyspeedy.com/fedora/
 http://mirror.epn.edu.ec/fedora/linux/
 http://mirror.etf.bg.ac.rs/fedora/
 http://mirror.euserv.net/linux/fedora/linux/
+http://mirror.fcix.net/fedora/linux/
 http://mirror.globo.com/fedora/linux/
 http://mirror.i3d.net/pub/fedora/linux/
+http://mirror.ihost.md/fedora/
 http://mirror.in2p3.fr/pub/fedora/linux/
 http://mirror.infonline.de/fedora/linux/
 http://mirror.init7.net/fedora/fedora/linux/
+http://mirror.it4i.cz
 http://mirror.it4i.cz/fedora/linux/
 http://mirror.its.dal.ca/pub/fedora/linux/
 http://mirror.karneval.cz/pub/linux/fedora/linux/
 http://mirror.lagoon.nc/pub/fedora/linux/
 http://mirror.library.ucy.ac.cy/linux/fedora/linux/
 http://mirror.linux-ia64.org/fedora/fedora/linux/
+http://mirror.linux-ia64.org/fedora/fedora/linux/
+http://mirror.linux-ia64.org/fedora/linux/
+http://mirror.math.princeton.edu/pub/fedora/linux/
 http://mirror.metrocast.net/fedora/linux/
 http://mirror.mrjester.net/fedora/linux/
 http://mirror.netcologne.de/fedora/linux/
 http://mirror.netsite.dk/fedora/linux/
+http://mirror.netzwerge.de/fedora/linux/
 http://mirror.nexcess.net/fedora/
 http://mirror.nl.leaseweb.net/fedora/linux/
 http://mirror.nonstop.co.il/fedora/linux/
@@ -120,31 +139,41 @@ http://mirror.realcompute.io/fedora/linux/
 http://mirror.rise.ph/fedora/linux/
 http://mirror.rnet.missouri.edu/fedora/linux/
 http://mirror.seas.harvard.edu/fedora/linux/
+http://mirror.serverion.com/fedora/linux
+http://mirror.serverion.com/fedora/linux
 http://mirror.sfo12.us.leaseweb.net/fedora/linux/
+http://mirror.siena.edu/fedora/linux/
 http://mirror.slu.cz/fedora/linux/
 http://mirror.smartmedia.net.id/fedora/linux/
 http://mirror.steadfast.net/fedora/
 http://mirror.steadfastnet.com/epel/
+http://mirror.stjschools.org/fedora/linux/
 http://mirror.switch.ch/ftp/mirror/fedora/linux/
 http://mirror.szerverem.hu/fedora/linux/
 http://mirror.telepoint.bg/fedora/
 http://mirror.umd.edu/fedora/linux/
 http://mirror.upb.edu.co/fedora/linux/
 http://mirror.us.leaseweb.net/fedora/linux/
+http://mirror.usi.edu/pub/fedora/linux/
 http://mirror.uta.edu.ec/fedora/linux/
 http://mirror.utexas.edu/fedora/linux/
 http://mirror.uv.es/mirror/fedora/linux/
 http://mirror.veriteknik.net.tr/fedora/linux/
 http://mirror.vorboss.net/fedora/linux/
 http://mirror.vpsnet.com/fedora/linux/
 http://mirror.vutbr.cz/fedora/
+http://mirror.xenyth.net/fedora/linux/
 http://mirror.yandex.ru/fedora/linux/
 http://mirror2.totbb.net/fedora/linux/
 http://mirroronet.pl/pub/mirrors/fedora/linux/
 http://mirrors.cat.pdx.edu/fedora/linux/
 http://mirrors.dotsrc.org/fedora-enchilada/linux/
+http://mirrors.dotsrc.org/fedora/linux
+http://mirrors.dotsrc.org/fedora/linux
 http://mirrors.dotsrc.org/fedora/linux/
 http://mirrors.fedoraproject.org
+http://mirrors.fedoraproject.org/fedora/linux
+http://mirrors.fedoraproject.org/fedora/linux
 http://mirrors.ircam.fr/pub/fedora/linux/
 http://mirrors.kernel.org/fedora/
 http://mirrors.lug.mtu.edu/fedora/linux/
@@ -153,18 +182,33 @@ http://mirrors.n-ix.net/fedora/linux/
 http://mirrors.nav.ro/fedora/linux/
 http://mirrors.netix.net/fedora/linux/
 http://mirrors.nic.cz/fedora/linux/
+http://mirrors.rit.edu/fedora/fedora/linux
+http://mirrors.rit.edu/fedora/fedora/linux/
 http://mirrors.syringanetworks.net/fedora/linux/
 http://mirrors.uni-ruse.bg/fedora/linux/
 http://mirrors.xmission.com/fedora/linux/
 http://mirrors.xtom.de
+http://mirrors.xtom.de/fedora/
+http://mirrors.xtom.ee/fedora/linux
+http://mirrors.xtom.ee/fedora/linux
 http://muug.ca/mirror/fedora/linux/
+http://nnenix.mm.fcix.net/fedora/linux
+http://nnenix.mm.fcix.net/fedora/linux
+http://nocix.mm.fcix.net/fedora/linux/
+http://opencolo.mm.fcix.net/fedora/linux/
 http://opensource.nchc.org.tw/fedora/linux/
 http://packages.oit.ncsu.edu
 http://pubmirror1.math.uh.edu/fedora-buffet/fedora/linux/
 http://pubmirror2.math.uh.edu/fedora-buffet/fedora/linux/
 http://repo.fedora.md/fedora/linux/
+http://southfront.mm.fcix.net/fedora/linux/
 http://ucmirror.canterbury.ac.nz/linux/fedora/linux/
+http://uvermont.mm.fcix.net/fedora/linux
+http://uvermont.mm.fcix.net/fedora/linux
+http://veronanetworks.mm.fcix.net/fedora/linux/
 http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/fedora/linux/
+http://volico.mm.fcix.net/fedora/linux
 http://www.fedora.is/fedora/
 http://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/
 http://www.nic.funet.fi/pub/mirrors/fedora.redhat.com/pub/fedora/linux/
+http://ziply.mm.fcix.net/fedora/linux/