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

ben-grande · Dec 21, 2023 · a663616 · a663616
1 parent f161fbf
commit a663616
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/salt/sys-firewall/create.sls b/salt/sys-firewall/create.sls
@@ -38,6 +38,7 @@ features:
 - enable:
   - servicevm
   - service.qubes-firewall
+  - service.clocksync
 - disable:
   - service.cups
   - service.cups-browsed
@@ -64,6 +65,7 @@ prefs:
 features:
 - enable:
   - servicevm
+  - service.clocksync
 - disable:
   - appmenus-dispvm
   - service.cups
@@ -94,6 +96,7 @@ features:
 - enable:
   - servicevm
   - service.qubes-firewall
+  - service.clocksync
 - disable:
   - service.cups
   - service.cups-browsed

diff --git a/salt/sys-firewall/install.sls b/salt/sys-firewall/install.sls
@@ -23,5 +23,6 @@ include:
       - qubes-core-agent-networking
       - ca-certificates
       - iproute2
+      - systemd-timesyncd
 
 {% endif -%}
diff --git a/salt/sys-firewall/prefs-disp.sls b/salt/sys-firewall/prefs-disp.sls
@@ -7,14 +7,20 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
   - .create
 
-"{{ slsdotpath }}-qubes-prefs-updatevm":
+"disp-{{ slsdotpath }}-qubes-prefs-updatevm":
   cmd.run:
     - require:
       - sls: {{ slsdotpath }}.clone
     - name: qubes-prefs updatevm disp-{{ slsdotpath }}
 
-"{{ slsdotpath }}-qubes-prefs-default_netvm":
+"disp-{{ slsdotpath }}-qubes-prefs-default_netvm":
   cmd.run:
     - require:
       - sls: {{ slsdotpath }}.clone
     - name: qubes-prefs default_netvm disp-{{ slsdotpath }}
+
+"disp-{{ slsdotpath }}-qubes-prefs-clockvm":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-prefs clockvm disp-{{ slsdotpath }}
diff --git a/salt/sys-firewall/prefs.sls b/salt/sys-firewall/prefs.sls
@@ -18,3 +18,9 @@ include:
     - require:
       - sls: {{ slsdotpath }}.create
     - name: qubes-prefs default_netvm {{ slsdotpath }}
+
+"{{ slsdotpath }}-qubes-prefs-clockvm":
+  cmd.run:
+    - require:
+      - sls: {{ slsdotpath }}.create
+    - name: qubes-prefs clockvm {{ slsdotpath }}
diff --git a/salt/sys-net/create.sls b/salt/sys-net/create.sls
@@ -36,7 +36,6 @@ features:
 - enable:
   - servicevm
   - service.qubes-updates-proxy
-  - service.clocksync
 - disable:
   - service.cups
   - service.cups-browsed
@@ -66,7 +65,6 @@ features:
 - enable:
   - servicevm
   - service.qubes-updates-proxy
-  - service.clocksync
 - disable:
   - appmenus-dispvm
   - service.cups
@@ -97,7 +95,6 @@ features:
 - enable:
   - servicevm
   - service.qubes-updates-proxy
-  - service.clocksync
 - disable:
   - appmenus-dispvm
   - service.cups

diff --git a/salt/sys-net/install.sls b/salt/sys-net/install.sls
@@ -24,6 +24,5 @@ include:
       - wpasupplicant
       - gnome-keyring
       - notification-daemon
-      - systemd-timesyncd
 
 {% endif -%}
diff --git a/salt/sys-net/prefs-disp.sls b/salt/sys-net/prefs-disp.sls
@@ -8,19 +8,13 @@ include:
   - .create
 
 {% 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:
     - require:
       - qvm: disp-{{ slsdotpath }}
     - name: {{ default_netvm }}
     - prefs:
       - 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 -%}
 {{ policy_set(sls_path, '80') }}
diff --git a/salt/sys-net/prefs.sls b/salt/sys-net/prefs.sls
@@ -8,19 +8,13 @@ include:
   - .create
 
 {% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%}
-"default_netvm-netvm-{{ slsdotpath }}":
+"{{ slsdotpath }}-set-{{ default_netvm }}-netvm-to-{{ slsdotpath }}":
   qvm.vm:
     - require:
       - qvm: {{ slsdotpath }}
     - name: {{ default_netvm }}
     - prefs:
       - netvm: {{ slsdotpath }}
 
-"clockvm-{{ slsdotpath }}":
-  cmd.run:
-    - require:
-      - qvm: {{ slsdotpath }}
-    - name: qubes-prefs clockvm {{ slsdotpath }}
-
 {% from 'utils/macros/policy.sls' import policy_set with context -%}
 {{ policy_set(sls_path, '80') }}