From 4674c91224b1d096046d7d33c4832e52d82642d3 Mon Sep 17 00:00:00 2001
From: unman <unman@thirdeyesecurity.org>
Date: Thu, 7 Oct 2021 14:48:30 +0000
Subject: [PATCH] Put custom fedora_mirrors in the template, not the qube

---
 cacher/README        | 4 ++--
 cacher/configure.sls | 7 -------
 cacher/install.sls   | 9 ++++++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/cacher/README b/cacher/README
index 0937427..16413f3 100644
--- a/cacher/README
+++ b/cacher/README
@@ -15,10 +15,10 @@ qubesctl state.apply cacher.use
 This will configure /etc/qubes-rpc/policy/qubes.UpdatesProxy to use the cachingproxy be default.
 
 apt-cacher-ng will cache HTTPS requests if you change https:// to http://HTTPS/// in repo source lists.
-To configure the templates to use the proxyin this way, run:  
+To configure the templates to use the proxy in this way, run:  
 qubesctl --skip-dom0 --targets=Templates state.apply cacher.change_templates.sls  
 Or target individual templates, as you wish.
 
 N.B
 apt-cacher-ng works well for Debian,Ubuntu,and Arch.  
-It works reasonably well for Fedora, but may require tweaking of the apt-cacher-ng control file.
+It works reasonably well for Fedora, but may require tweaking of the apt-cacher-ng control file, and the fedora_mirrors lists.
diff --git a/cacher/configure.sls b/cacher/configure.sls
index 958f4be..3cf6b1b 100644
--- a/cacher/configure.sls
+++ b/cacher/configure.sls
@@ -18,10 +18,3 @@
     - user: root
     - group: root
     - makedirs: True
-
-/etc/apt-cacher-ng/fedora_mirrors:
-  file.managed:
-    - source:
-      - salt://cacher/fedora_mirrors
-    - user: root
-    - group: root
diff --git a/cacher/install.sls b/cacher/install.sls
index b54c19b..7da4b4a 100644
--- a/cacher/install.sls
+++ b/cacher/install.sls
@@ -38,6 +38,9 @@ cp /lib/apt-cacher-ng/deb_mirrors.gz /etc/apt-cacher-ng/deb_mirrors.gz:
   cmd.run:
     - runas: root
 
-cp /lib/apt-cacher-ng/fedora_mirrors /etc/apt-cacher-ng/fedora_mirrors:
-  cmd.run:
-    - runas: root
+/etc/apt-cacher-ng/fedora_mirrors:
+  file.managed:
+    - source:
+      - salt://cacher/fedora_mirrors
+    - user: root
+    - group: root