Split GPG - update to 4.1

gpg/clone.sls

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

gpg/create.sls

@@ -27,6 +27,5 @@ qvm-features-id:
 
 update_file:
   file.prepend:
-    - name: '/etc/qubes-rpc/policy/qubes.Gpg'
-    - text: '@anyvm @anyvm ask,default_target=gpg'
-
+    - name: '/etc/qubes/policy.d/30-user.policy'
+    - text: 'qubes.Gpg  *  @anyvm  @anyvm ask default_target=gpg'

gpg/install.sls

@@ -1,22 +1,17 @@
 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
+{% if salt['qvm.exists']('cacher') %}
+
 /etc/apt/sources.list:
   file.replace:
+    - names:
+      - /etc/apt/sources.list
+      - /etc/apt/sources.list.d/qubes-r4.list
     - pattern: 'https:'
     - repl: 'http://HTTPS/'
     - flags: [ 'IGNORECASE', 'MULTILINE' ]
 
-/etc/apt/sources.list.d/qubes-r4.list:
-  file.replace:
-    - pattern: 'https:'
-    - repl: 'http://HTTPS/'
-    - flags: [ 'IGNORECASE', 'MULTILINE' ]
-
-allow-testing:
-  file.uncomment:
-    - name: /etc/apt/sources.list.d/qubes-r4.list
-    - regex: ^deb\s.*qubes-os.org.*-testing
-    - backup: false
+{% endif %}
 
 installed:
   pkg.installed: