Split GPG - update to 4.2.

Handle all repositories for cacher as necessary

gpg/clone.sls

@@ -1,11 +1,11 @@
 gpg_precursor:
   qvm.template_installed:
-    - name: debian-11-minimal
+    - name: debian-12-minimal
 
 qvm-clone-id:
   qvm.clone:
     - name: template-gpg
-    - source: debian-11-minimal
+    - source: debian-12-minimal
 
 'sudo qubes-dom0-update qubes-gpg-split-dom0':
   cmd.run

gpg/install.sls

@@ -1,18 +1,30 @@
 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
-
 {% if salt['pillar.get']('update_proxy:caching') %}
+{% if grains['os_family']|lower == 'debian' %}
+{% if grains['nodename']|lower != 'host' %}
+{% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*list') %}
+{{ repo }}_baseurl:
+  file.replace:
+    - name: {{ repo }}
+    - pattern: 'https://'
+    - repl: 'http://HTTPS///'
+    - flags: [ 'IGNORECASE', 'MULTILINE' ]
+    - backup: False
+
+{% endfor %}
 
 /etc/apt/sources.list:
   file.replace:
-    - names:
-      - /etc/apt/sources.list
-      - /etc/apt/sources.list.d/qubes-r4.list
+    - name: /etc/apt/sources.list
     - pattern: 'https:'
     - repl: 'http://HTTPS/'
     - flags: [ 'IGNORECASE', 'MULTILINE' ]
+    - backup: False
 
 {% endif %}
+{% endif %}
+{% endif %}
 
 installed:
   pkg.installed: