Split GPG - update to 4.2.

Handle all repositories for cacher as necessary
This commit is contained in:
unman 2024-02-07 03:40:32 +00:00
parent 18145a9f8d
commit 935e0e9c07
No known key found for this signature in database
GPG Key ID: FDD1B8244731B36C
2 changed files with 18 additions and 6 deletions

View File

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

View File

@ -1,18 +1,30 @@
# vim: set syntax=yaml ts=2 sw=2 sts=2 et : # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
{% if salt['pillar.get']('update_proxy:caching') %} {% 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: /etc/apt/sources.list:
file.replace: file.replace:
- names: - name: /etc/apt/sources.list
- /etc/apt/sources.list
- /etc/apt/sources.list.d/qubes-r4.list
- pattern: 'https:' - pattern: 'https:'
- repl: 'http://HTTPS/' - repl: 'http://HTTPS/'
- flags: [ 'IGNORECASE', 'MULTILINE' ] - flags: [ 'IGNORECASE', 'MULTILINE' ]
- backup: False
{% endif %} {% endif %}
{% endif %}
{% endif %}
installed: installed:
pkg.installed: pkg.installed: