diff --git a/cacher/50_user.conf b/cacher/50_user.conf index 5f4147f..75ba8b5 100644 --- a/cacher/50_user.conf +++ b/cacher/50_user.conf @@ -5,3 +5,4 @@ binds+=( '/etc/apt-cacher-ng/archlx_mirrors_extra' ) binds+=( '/etc/apt-cacher-ng/debian_mirrors_extra' ) binds+=( '/etc/apt-cacher-ng/fedora_mirrors_extra' ) binds+=( '/etc/apt-cacher-ng/blackarch_mirror-list' ) +binds+=( '/etc/apt-cacher-ng/Qubes_mirrors' ) diff --git a/cacher/Qubes_mirrors b/cacher/Qubes_mirrors new file mode 100644 index 0000000..9b3ca81 --- /dev/null +++ b/cacher/Qubes_mirrors @@ -0,0 +1,30 @@ +http://ftp.halifax.rwth-aachen.de/qubes/ +http://ftp.icm.edu.pl/pub/os/qubes/ +https://ftp.cc.uoc.gr/mirrors/linux/qubes/ +https://ftp.qubes-os.org/ +https://ftp.rnl.tecnico.ulisboa.pt/pub/qubesos/ +https://is.mirror.flokinet.net/qubes/ +https://mirror-2.hosthink.net/qubes/ +https://mirror.accum.se/mirror/qubes-os.org/ +https://mirror.hackingand.coffee/qubes/ +https://mirror.koljasagorski.de/qubes/ +https://mirror.krmir.org/qubes/ +https://mirror.leitecastro.com/qubes/ +https://mirror.library.ucy.ac.cy/linux/qubes/ +https://mirrors.aliyun.com/qubes/ +https://mirrors.dgplug.org/qubes/ +https://mirrors.dotsrc.org/qubes/ +https://mirrors.edge.kernel.org/qubes/ +https://mirrors.gigenet.com/qubes/ +https://mirrors.hyperreal.coffee/qubes/ +https://mirrors.nju.edu.cn/qubes/ +https://mirrors.qontinuum.space/qubes-os/ +https://mirrors.tuna.tsinghua.edu.cn/qubesos/ +https://mirrors.ukfast.co.uk/sites/qubes-os.org/ +https://nl.mirror.flokinet.net/qubes/ +https://plug-mirror.rcac.purdue.edu/qubes/ +https://polish-mirror.evolution-host.com/qubes/ +https://quantum-mirror.hu/mirrors/pub/qubes/ +https://qubes-mirror.igniterefereeing.com.au/ +https://qubesos-mirror.applied-privacy.net/ +https://ro.mirror.flokinet.net/qubes/ diff --git a/cacher/acng.conf b/cacher/acng.conf index 4189bb2..a5e6f40 100644 --- a/cacher/acng.conf +++ b/cacher/acng.conf @@ -75,6 +75,7 @@ Remap-debrep: file:deb_mirror*.gz file:debian_mirrors_extra /debian ; file:backe Remap-fedrep: file:fedora_mirrors file:fedora_mirrors_extra ; https://mirrors.kernel.org/fedora/ https://ftp-stud.hs-esslingen.de/pub/fedora/linux/ # Fedora Linux Remap-uburep: file:ubuntu_mirrors /ubuntu ; file:backends_ubuntu # Ubuntu Archives +Remap-Qubes: file:Qubes_mirrors Remap-klxrep: file:kali_mirrors /kali ; file:backends_kali # Kali Linux Archives Remap-cygwin: file:cygwin_mirrors /cygwin # ; file:backends_cygwin # incomplete, please create this file or specify preferred mirrors here Remap-sfnet: file:sfnet_mirrors # ; file:backends_sfnet # incomplete, please create this file or specify preferred mirrors here diff --git a/cacher/configure.sls b/cacher/configure.sls index 2ec168c..9552676 100644 --- a/cacher/configure.sls +++ b/cacher/configure.sls @@ -2,15 +2,17 @@ {% if grains['nodename'] != 'dom0' %} -/rw/config/rc.local: +cacher_/rw/config/rc.local: file.append: + - name: /rw/config/rc.local - text: | systemctl unmask apt-cacher-ng systemctl start apt-cacher-ng /usr/sbin/nft insert rule qubes custom-input tcp dport 8082 accept -/rw/config/qubes-firewall-user-script: +cacher_/rw/config/qubes-firewall-user-script: file.append: + - name: /rw/config/qubes-firewall-user-script - text: /usr/sbin/nft insert rule qubes custom-input tcp dport 8082 accept /rw/config/qubes-bind-dirs.d/50_user.conf: diff --git a/cacher/mirrors.sls b/cacher/mirrors.sls index f7485e4..7eefa53 100644 --- a/cacher/mirrors.sls +++ b/cacher/mirrors.sls @@ -5,6 +5,14 @@ {% if grains['nodename'] != 'dom0' %} +/etc/apt-cacher-ng/Qubes_mirrors: + file.managed: + - source: + - salt://cacher/Qubes_mirrors + - user: root + - group: root + - makedirs: True + /etc/apt-cacher-ng/fedora_mirrors_extra: file.managed: - source: