Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-01-11 07:29:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: move clockvm out of sys-net to sys-firewall

Browse Source
This commit is contained in:
Ben Grande 2023-12-21 23:38:39 +01:00
parent f21f676adf
commit ad6f5e29fe
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/sys-firewall/create.sls
View File

@ -38,6 +38,7 @@ features:
- enable: - enable:
- servicevm - servicevm
- service.qubes-firewall - service.qubes-firewall
- service.clocksync
- disable: - disable:
- service.cups - service.cups
- service.cups-browsed - service.cups-browsed
@ -64,6 +65,7 @@ prefs:
features: features:
- enable: - enable:
- servicevm - servicevm
- service.clocksync
- disable: - disable:
- appmenus-dispvm - appmenus-dispvm
- service.cups - service.cups
@ -94,6 +96,7 @@ features:
- enable: - enable:
- servicevm - servicevm
- service.qubes-firewall - service.qubes-firewall
- service.clocksync
- disable: - disable:
- service.cups - service.cups
- service.cups-browsed - service.cups-browsed

1
salt/sys-firewall/install.sls
View File

@ -23,5 +23,6 @@ include:
- qubes-core-agent-networking - qubes-core-agent-networking
- ca-certificates - ca-certificates
- iproute2 - iproute2
- systemd-timesyncd
{% endif -%} {% endif -%}

10
salt/sys-firewall/prefs-disp.sls
View File

@ -7,14 +7,20 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .create - .create
"{{ slsdotpath }}-qubes-prefs-updatevm": "disp-{{ slsdotpath }}-qubes-prefs-updatevm":
cmd.run: cmd.run:
- require: - require:
- sls: {{ slsdotpath }}.clone - sls: {{ slsdotpath }}.clone
- name: qubes-prefs updatevm disp-{{ slsdotpath }} - name: qubes-prefs updatevm disp-{{ slsdotpath }}
"{{ slsdotpath }}-qubes-prefs-default_netvm": "disp-{{ slsdotpath }}-qubes-prefs-default_netvm":
cmd.run: cmd.run:
- require: - require:
- sls: {{ slsdotpath }}.clone - sls: {{ slsdotpath }}.clone
- name: qubes-prefs default_netvm disp-{{ slsdotpath }} - name: qubes-prefs default_netvm disp-{{ slsdotpath }}
"disp-{{ slsdotpath }}-qubes-prefs-clockvm":
cmd.run:
- require:
- sls: {{ slsdotpath }}.create
- name: qubes-prefs clockvm disp-{{ slsdotpath }}

6
salt/sys-firewall/prefs.sls
View File

@ -18,3 +18,9 @@ include:
- require: - require:
- sls: {{ slsdotpath }}.create - sls: {{ slsdotpath }}.create
- name: qubes-prefs default_netvm {{ slsdotpath }} - name: qubes-prefs default_netvm {{ slsdotpath }}
"{{ slsdotpath }}-qubes-prefs-clockvm":
cmd.run:
- require:
- sls: {{ slsdotpath }}.create
- name: qubes-prefs clockvm {{ slsdotpath }}

3
salt/sys-net/create.sls
View File

@ -36,7 +36,6 @@ features:
- enable: - enable:
- servicevm - servicevm
- service.qubes-updates-proxy - service.qubes-updates-proxy
- service.clocksync
- disable: - disable:
- service.cups - service.cups
- service.cups-browsed - service.cups-browsed
@ -66,7 +65,6 @@ features:
- enable: - enable:
- servicevm - servicevm
- service.qubes-updates-proxy - service.qubes-updates-proxy
- service.clocksync
- disable: - disable:
- appmenus-dispvm - appmenus-dispvm
- service.cups - service.cups
@ -97,7 +95,6 @@ features:
- enable: - enable:
- servicevm - servicevm
- service.qubes-updates-proxy - service.qubes-updates-proxy
- service.clocksync
- disable: - disable:
- appmenus-dispvm - appmenus-dispvm
- service.cups - service.cups

1
salt/sys-net/install.sls
View File

@ -24,6 +24,5 @@ include:
- wpasupplicant - wpasupplicant
- gnome-keyring - gnome-keyring
- notification-daemon - notification-daemon
- systemd-timesyncd
{% endif -%} {% endif -%}

8
salt/sys-net/prefs-disp.sls
View File

@ -8,7 +8,7 @@ include:
- .create - .create
{% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%} {% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%}
"default_netvm-netvm-disp-{{ slsdotpath }}": "{{ slsdotpath }}-set-{{ default_netvm }}-netvm-to-disp-{{ slsdotpath }}":
qvm.vm: qvm.vm:
- require: - require:
- qvm: disp-{{ slsdotpath }} - qvm: disp-{{ slsdotpath }}
@ -16,11 +16,5 @@ include:
- prefs: - prefs:
- netvm: disp-{{ slsdotpath }} - netvm: disp-{{ slsdotpath }}
"clockvm-disp-{{ slsdotpath }}":
cmd.run:
- require:
- qvm: disp-{{ slsdotpath }}
- name: qubes-prefs clockvm disp-{{ slsdotpath }}
{% from 'utils/macros/policy.sls' import policy_set with context -%} {% from 'utils/macros/policy.sls' import policy_set with context -%}
{{ policy_set(sls_path, '80') }} {{ policy_set(sls_path, '80') }}

8
salt/sys-net/prefs.sls
View File

@ -8,7 +8,7 @@ include:
- .create - .create
{% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%} {% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%}
"default_netvm-netvm-{{ slsdotpath }}": "{{ slsdotpath }}-set-{{ default_netvm }}-netvm-to-{{ slsdotpath }}":
qvm.vm: qvm.vm:
- require: - require:
- qvm: {{ slsdotpath }} - qvm: {{ slsdotpath }}
@ -16,11 +16,5 @@ include:
- prefs: - prefs:
- netvm: {{ slsdotpath }} - netvm: {{ slsdotpath }}
"clockvm-{{ slsdotpath }}":
cmd.run:
- require:
- qvm: {{ slsdotpath }}
- name: qubes-prefs clockvm {{ slsdotpath }}
{% from 'utils/macros/policy.sls' import policy_set with context -%} {% from 'utils/macros/policy.sls' import policy_set with context -%}
{{ policy_set(sls_path, '80') }} {{ policy_set(sls_path, '80') }}