fix: add whonix dvm

This commit is contained in:
Ben Grande 2024-01-22 10:56:31 +01:00
parent d75a59f54b
commit adba858477
4 changed files with 55 additions and 0 deletions

View File

@ -20,6 +20,7 @@ Template based on it.
qubesctl top.enable whonix qubesctl top.enable whonix
qubesctl --targets=whonix-workstation-17,whonix-gateway-17 state.apply qubesctl --targets=whonix-workstation-17,whonix-gateway-17 state.apply
qubesctl top.disable whonix qubesctl top.disable whonix
qubesctl state.apply whonix.appmenus
``` ```
- State: - State:
@ -27,6 +28,7 @@ qubesctl top.disable whonix
```sh ```sh
qubesctl state.apply whonix.create qubesctl state.apply whonix.create
qubesctl --skip-dom0 --targets=whonix-workstation-17,whonix-gateway-17 state.apply whonix.install qubesctl --skip-dom0 --targets=whonix-workstation-17,whonix-gateway-17 state.apply whonix.install
qubesctl state.apply whonix.appmenus
``` ```
<!-- pkg:end:post-install --> <!-- pkg:end:post-install -->

10
salt/whonix/appmenus.sls Normal file
View File

@ -0,0 +1,10 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{%- import slsdotpath ~ "/template.jinja" as template -%}
{% from 'utils/macros/sync-appmenus.sls' import sync_appmenus -%}
{{ sync_appmenus('dvm-' ~ template.whonix_workstation_clean_template) }}

10
salt/whonix/appmenus.top Normal file
View File

@ -0,0 +1,10 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'dom0':
- match: nodegroup
- whonix.appmenus

View File

@ -43,6 +43,36 @@ features:
{%- endload %} {%- endload %}
{{ load(defaults) }} {{ load(defaults) }}
{% load_yaml as defaults -%}
name: dvm-{{ template.whonix_workstation_clean_template }}
force: True
require:
- qvm: sys-{{ slsdotpath }}
- qvm: anon-{{ slsdotpath }}
present:
- template: {{ template.whonix_workstation_template }}
- label: red
prefs:
- template: {{ template.whonix_workstation_template }}
- label: red
- netvm: sys-{{ slsdotpath }}
- audiovm: ""
- default_dispvm: dvm-{{ template.whonix_workstation_clean_template }}
- vcpus: 1
- memory: 300
- maxmem: 1500
- template_for_dispvms: True
- include_in_backups: False
- autostart: False
features:
- enable:
- appmenus-dispvm
tags:
- add:
- anon-vm
{%- endload %}
{{ load(defaults) }}
{% load_yaml as defaults -%} {% load_yaml as defaults -%}
name: sys-{{ slsdotpath }} name: sys-{{ slsdotpath }}
force: True force: True
@ -56,6 +86,7 @@ prefs:
- template: {{ template.whonix_gateway_template }} - template: {{ template.whonix_gateway_template }}
- label: black - label: black
- audiovm: "" - audiovm: ""
- default_dispvm: dvm-{{ template.whonix_workstation_clean_template }}
- vcpus: 1 - vcpus: 1
- memory: 300 - memory: 300
- maxmem: 500 - maxmem: 500
@ -68,6 +99,7 @@ tags:
{%- endload %} {%- endload %}
{{ load(defaults) }} {{ load(defaults) }}
{% load_yaml as defaults -%} {% load_yaml as defaults -%}
name: anon-{{ slsdotpath }} name: anon-{{ slsdotpath }}
force: True force: True
@ -83,6 +115,7 @@ prefs:
- label: red - label: red
- netvm: sys-{{ slsdotpath }} - netvm: sys-{{ slsdotpath }}
- audiovm: "" - audiovm: ""
- default_dispvm: dvm-{{ template.whonix_workstation_clean_template }}
- vcpus: 1 - vcpus: 1
- memory: 300 - memory: 300
- maxmem: 1500 - maxmem: 1500