diff --git a/cacher/acng.conf b/cacher/acng.conf index ed8af32..c891e2d 100644 --- a/cacher/acng.conf +++ b/cacher/acng.conf @@ -218,9 +218,9 @@ ExThreshold: 4 # # To see examples of the expected syntax, run: apt-cacher-ng -p debug=1 # -PfilePatternEx: .*xml.zck$|.*yaml.gz$|.*fedora.*arch=x86_64$|.*f35&arch=x86_64|.*f36&arch=x86_64 +PfilePatternEx: .*yaml.gz$|.*fedora.*arch=x86_64$|.*f35&arch=x86_64|.*f36&arch=x86_64|.*f37&arch=x86_64 # VfilePatternEx: -VfilePatternEx: ^/\?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 # SPfilePatternEx: # SVfilePatternEx: # WfilePatternEx: @@ -303,6 +303,7 @@ VfilePatternEx: ^/\?release=[0-9]+&arch=.*|.*/RPM-GPG-KEY.*|.*\?repo=fedora|.*pk # # Example: # DontCache: .*.local.university.int +DontCache: .*fedora.*updates.*updateinfo.xml.zck # Default permission set of freshly created files and directories, as octal # numbers (see chmod(1) for details). diff --git a/cacher/fedora_mirrors b/cacher/fedora_mirrors index cfcde07..7467455 100644 --- a/cacher/fedora_mirrors +++ b/cacher/fedora_mirrors @@ -1,12 +1,13 @@ http://archive.linux.duke.edu/pub/fedora/linux/ -http://download.fedoraproject.org/pub/fedora/linux/ +http://distrib-coffee.ipsl.jussieu.fr/pub/linux/fedora/linux/ http://dl.fedoraproject.org +http://download.fedoraproject.org/pub/fedora/linux/ http://fedora-mirror01.rbc.ru/pub/fedora/linux/ http://fedora.blizoo.mk/fedora/linux/ http://fedora.cu.be -http://fedora.is.co.za/linux/ http://fedora.ip-connect.info http://fedora.ipacct.com +http://fedora.is.co.za/linux/ http://fedora.mirror.angkasa.id/pub/fedora/linux/ http://fedora.mirror.constant.com http://fedora.mirror.digitalpacific.com.au/linux/ @@ -25,6 +26,7 @@ http://free.nchc.org.tw/fedora/linux/ http://ftp-nyc.osuosl.org 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/ http://ftp.cc.uoc.gr/pub/linux/fedora/linux/ http://ftp.cica.es/fedora/linux/ http://ftp.colocall.net/pub/fedora/linux/ @@ -40,7 +42,9 @@ 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.plusline.net/fedora/linux/ http://ftp.tsukuba.wide.ad.jp/Linux/fedora/linux/ +http://ftp.tudelft.nl/download.fedora.redhat.com/linux/ http://ftp.uma.es/mirror/fedora/linux/ http://ftp.uni-bayreuth.de/linux/fedora/linux/ http://ftp.uni-kl.de/pub/linux/fedora/linux/ @@ -70,6 +74,7 @@ http://mirror.datacenter.by/pub/fedoraproject.org/linux/ http://mirror.de.leaseweb.net/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.globo.com/fedora/linux/ http://mirror.i3d.net/pub/fedora/linux/ @@ -78,6 +83,7 @@ http://mirror.infonline.de/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/linux/ http://mirror.metrocast.net/fedora/linux/ http://mirror.mrjester.net/fedora/linux/ @@ -102,6 +108,7 @@ http://mirror.steadfast.net/fedora/ http://mirror.steadfastnet.com/epel/ 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/ @@ -136,6 +143,6 @@ http://pubmirror1.math.uh.edu/fedora-buffet/fedora/linux/ http://pubmirror2.math.uh.edu/fedora-buffet/fedora/linux/ http://ucmirror.canterbury.ac.nz/linux/fedora/linux/ http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/fedora/linux/ +http://www.fedora.is/fedora/linux/ 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://www.fedora.is diff --git a/cacher/install.sls b/cacher/install.sls index a4dd892..bdd9f66 100644 --- a/cacher/install.sls +++ b/cacher/install.sls @@ -5,6 +5,9 @@ {% if grains['nodename'] != 'dom0' %} +include: + - cacher.mirrors + allow-testing: file.uncomment: - name: /etc/apt/sources.list.d/qubes-r4.list @@ -42,20 +45,6 @@ cp /lib/apt-cacher-ng/deb_mirrors.gz /etc/apt-cacher-ng/deb_mirrors.gz: cmd.run: - runas: root -/etc/apt-cacher-ng/fedora_mirrors: - file.managed: - - source: - - salt://cacher/fedora_mirrors - - user: root - - group: root - -/etc/apt-cacher-ng/archlx_mirrors: - file.managed: - - source: - - salt://cacher/archlx_mirrors - - user: root - - group: root - /usr/lib/qubes-bind-dirs.d/30_cron.conf: file.append: - text: "binds+=( ' /etc/anacrontab' )"