Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-02-23 08:19:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: whonix naming without abbreviations

Browse Source
This commit is contained in:
Ben Grande 2023-12-19 13:00:57 +01:00
parent b0626bd15b
commit fcfb2e236c
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/whonix/README.md
View File

@ -18,18 +18,15 @@ Template based on it.
- Top: - Top:
```sh ```sh
qubesctl top.enable whonix qubesctl top.enable whonix
qubesctl state.apply qubesctl --targets=whonix-workstation-17,whonix-gateway-17 state.apply
qubesctl top.disable whonix qubesctl top.disable whonix
qubesctl state.apply qvm.anon-whonix
qubesctl state.apply qvm.whonix-ws-dvm
``` ```
- State: - State:
<!-- pkg:begin:post-install --> <!-- pkg:begin:post-install -->
```sh ```sh
qubesctl state.apply whonix.create qubesctl state.apply whonix.create
qubesctl state.apply qvm.anon-whonix qubesctl --skip-dom0 --targets=whonix-workstation-17,whonix-gateway-17 state.apply whonix.install
qubesctl state.apply qvm.whonix-ws-dvm
``` ```
<!-- pkg:end:post-install --> <!-- pkg:end:post-install -->

8
salt/whonix/clone.sls
View File

@ -6,12 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{%- import slsdotpath ~ "/template.jinja" as whonix -%} {%- import slsdotpath ~ "/template.jinja" as whonix -%}
"{{ whonix.whonix_gw_template }}-installed": "{{ whonix.whonix_gateway_template }}-installed":
qvm.template_installed: qvm.template_installed:
- name: {{ whonix.whonix_gw_template }} - name: {{ whonix.whonix_gateway_template }}
- fromrepo: {{ whonix.whonix_repo }} - fromrepo: {{ whonix.whonix_repo }}
"{{ whonix.whonix_ws_template }}-installed": "{{ whonix.whonix_workstation_template }}-installed":
qvm.template_installed: qvm.template_installed:
- name: whonix-ws-{{ whonix.whonix_ws_template }} - name: whonix-workstation-{{ whonix.whonix_workstation_template }}
- fromrepo: {{ whonix.whonix_repo }} - fromrepo: {{ whonix.whonix_repo }}

2
salt/whonix/create.sls
View File

@ -6,3 +6,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- whonix.clone - whonix.clone
- qvm.anon-whonix
- qvm.whonix-workstation-dvm

4
salt/whonix/install.top
View File

@ -5,6 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
base: base:
'dom0': 'whonix-workstation-17,whonix-gateway-17':
- match: nodegroup - match: list
- whonix.install - whonix.install

8
salt/whonix/template.jinja
View File

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% set whonix_version = salt['pillar.get']('qvm:whonix:version', '17') -%} {% set whonix_version = salt['pillar.get']('qvm:whonix:version', '17') -%}
{% set whonix_repo = salt['pillar.get']('qvm:whonix:repo', 'qubes-templates-community') -%} {% set whonix_repo = salt['pillar.get']('qvm:whonix:repo', 'qubes-templates-community') -%}
{% set whonix_ws_template = 'whonix-ws-' ~ whonix_version -%} {% set whonix_workstation_template = 'whonix-workstation-' ~ whonix_version -%}
{% set whonix_gw_template = 'whonix-gw-' ~ whonix_version -%} {% set whonix_gateway_template = 'whonix-gateway-' ~ whonix_version -%}
{% set whonix_ws_clean_template = 'whonix-ws' -%} {% set whonix_workstation_clean_template = 'whonix-workstation' -%}
{% set whonix_gw_clean_template = 'whonix-gw' -%} {% set whonix_gateway_clean_template = 'whonix-gateway' -%}