From 05e9854d054cf1df12831e12da4115db9add0ca3 Mon Sep 17 00:00:00 2001
From: Ben Grande <ben.grande.b@gmail.com>
Date: Thu, 14 Mar 2024 16:53:23 +0100
Subject: [PATCH] fix: remove cacher proxy from updatevm

Git revision is specified in the git module to Salt not fail trying to
verify it is in HEAD when it is in a tag from a previous installation.

Fixes: https://github.com/ben-grande/qusal/issues/27
---
 salt/sys-pihole/create.sls  | 4 ++++
 salt/sys-pihole/install.sls | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/salt/sys-pihole/create.sls b/salt/sys-pihole/create.sls
index 7fd3da20..63004893 100644
--- a/salt/sys-pihole/create.sls
+++ b/salt/sys-pihole/create.sls
@@ -52,8 +52,12 @@ features:
   - service.cups-browsed
   - service.tracker
   - service.evolution-data-server
+  - service.updates-proxy-setup
 - set:
   - menu-items: "pihole-browser.desktop qubes-run-terminal.desktop qubes-start.desktop"
+tags:
+- del:
+  - updatevm-sys-cacher
 {%- endload %}
 {{ load(defaults) }}
 
diff --git a/salt/sys-pihole/install.sls b/salt/sys-pihole/install.sls
index f98b3092..57f72a43 100644
--- a/salt/sys-pihole/install.sls
+++ b/salt/sys-pihole/install.sls
@@ -10,6 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 {% set pihole_tag = 'v5.17.2' -%}
 
 include:
+  - sys-cacher.uninstall-client
   - dotfiles.copy-x11
 
 "{{ slsdotpath }}-updated":
@@ -75,6 +76,7 @@ include:
 "{{ slsdotpath }}-git-clone":
   git.latest:
     - name: https://github.com/pi-hole/pi-hole.git
+    - rev: {{ pihole_tag }}
     - user: root
     - target: /root/pi-hole
     - force_fetch: True