From c002fc13bc80a49dbde922cb524dadcb2254fe4e Mon Sep 17 00:00:00 2001 From: unman Date: Thu, 8 Sep 2022 15:18:17 +0000 Subject: [PATCH] Reader qube - useful software. Make it default template, and base for debian-11-dvm --- reader/clone.sls | 16 +++++++++++++ reader/clone.top | 4 ++++ reader/install.sls | 60 ++++++++++++++++++++++++++++++++++++++++++++++ reader/install.top | 5 ++++ 4 files changed, 85 insertions(+) create mode 100644 reader/clone.sls create mode 100644 reader/clone.top create mode 100644 reader/install.sls create mode 100644 reader/install.top diff --git a/reader/clone.sls b/reader/clone.sls new file mode 100644 index 0000000..d289bd7 --- /dev/null +++ b/reader/clone.sls @@ -0,0 +1,16 @@ +clone_precursor: + qvm.template_installed: + - name: debian-11 + +qvm-clone-id: + qvm.clone: + - name: template-reader + - source: debian-11 + +change_default: + 'qubes-prefs default_template template-reader': + cmd.run + +change_template: + 'qvm-prefs debian-11-dvm template template-reader': + cmd.run diff --git a/reader/clone.top b/reader/clone.top new file mode 100644 index 0000000..464d5ad --- /dev/null +++ b/reader/clone.top @@ -0,0 +1,4 @@ +base: + dom0: + - match: nodegroup + - reader.clone diff --git a/reader/install.sls b/reader/install.sls new file mode 100644 index 0000000..d192d15 --- /dev/null +++ b/reader/install.sls @@ -0,0 +1,60 @@ +# vim: set syntax=yaml ts=2 sw=2 sts=2 et : +# +# +# + +{% if salt['qvm.exists']('cacher') %} +{% 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: + - name: /etc/apt/sources.list + - pattern: 'https:' + - repl: 'http://HTTPS/' + - flags: [ 'IGNORECASE', 'MULTILINE' ] + - backup: False + +{% endif %} +{% endif %} +{% endif %} + +{% if grains['nodename'] != 'dom0' %} + +allow-testing: + file.uncomment: + - name: /etc/apt/sources.list.d/qubes-r4.list + - regex: ^deb\s.*qubes-os.org.*-testing + - backup: false + +installed: + pkg.installed: + - refresh: True + - pkgs: + - qubes-core-agent-networking + - antiword + - edbrowse + - evince + - firefox-esr + - libreoffice + - mutt + - notmuch + - notmuch-mutt + - notmuch-vim + - offlineimap + - orca + - pdf2text + - w3m + +{% endif %} + diff --git a/reader/install.top b/reader/install.top new file mode 100644 index 0000000..0ff42b2 --- /dev/null +++ b/reader/install.top @@ -0,0 +1,5 @@ +# vim: set syntax=yaml ts=2 sw=2 sts=2 et : + +base: + '*': + - reader.install