From e670d026d40672162a908fd07c4ad1f9b3893b13 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Tue, 19 Dec 2023 21:12:07 +0100
Subject: [PATCH] fix: skip client setup on cacher initialization

Installing sys-cacher does not require that all templates change.
---
 salt/sys-cacher/README.md   | 1 +
 salt/sys-cacher/init.top    | 3 ---
 salt/sys-cacher/install.sls | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/salt/sys-cacher/README.md b/salt/sys-cacher/README.md
index 2b6f0d9..182901a 100644
--- a/salt/sys-cacher/README.md
+++ b/salt/sys-cacher/README.md
@@ -41,6 +41,7 @@ qubesctl top.enable sys-cacher browser
 qubesctl --targets=tpl-browser,tpl-sys-cacher,sys-cacher,sys-cacher-browser state.apply
 qubesctl top.disable sys-cacher browser
 qubesctl state.apply sys-cacher.appmenus,sys-cacher.tag
+qubesctl --skip-dom0 --templates state.apply sys-cacher.install-client
 ```
 
 - State
diff --git a/salt/sys-cacher/init.top b/salt/sys-cacher/init.top
index c09d020..e0e6bc1 100644
--- a/salt/sys-cacher/init.top
+++ b/salt/sys-cacher/init.top
@@ -14,6 +14,3 @@ base:
     - sys-cacher.configure
   'sys-cacher-browser':
     - sys-cacher.configure-browser
-  'I@qubes:type:template and not P@nodename:host and not P@nodename:whonix.*':
-    - match: compound
-    - sys-cacher.install-client
diff --git a/salt/sys-cacher/install.sls b/salt/sys-cacher/install.sls
index df913a8..516c8eb 100644
--- a/salt/sys-cacher/install.sls
+++ b/salt/sys-cacher/install.sls
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
   file.uncomment:
     - name: /etc/apt/sources.list.d/qubes-r4.list
     - regex: ^deb\s.*qubes-os.org.*-testing
-    - backup: false
+    - backup: False
 
 "{{ slsdotpath }}-updated":
   pkg.uptodate: