From 1cda4ca0d7d79ed60191dc6ee80b0721d9082bad Mon Sep 17 00:00:00 2001 From: unman Date: Mon, 1 Apr 2024 00:08:33 +0000 Subject: [PATCH] Salt - caching proxy - Make sure that configuration is correctly prepended to policy file --- cacher.spec | 5 ++++- cacher/use.sls | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cacher.spec b/cacher.spec index 680690f..70d5362 100644 --- a/cacher.spec +++ b/cacher.spec @@ -1,6 +1,6 @@ Name: 3isec-qubes-cacher Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A caching proxy in Qubes License: GPLv3+ @@ -79,6 +79,7 @@ if [ $1 -eq 1 ]; then qubesctl state.apply cacher.use qubesctl --skip-dom0 --templates state.apply cacher.change_templates elif [ $1 -eq 2 ]; then + qubesctl state.apply cacher.use qubesctl --skip-dom0 --targets=template-cacher state.apply cacher.update fi @@ -96,6 +97,8 @@ if [ $1 -eq 0 ]; then fi %changelog +* Sun Mar 31 2024 unman - 1.15.2 +- Make sure that configuration is correctly prepended to policy file. * Thu Feb 22 2024 unman - 1.15 - Bug fix * Sat Feb 10 2024 unman - 1.14 diff --git a/cacher/use.sls b/cacher/use.sls index bd05af2..1c50a72 100644 --- a/cacher/use.sls +++ b/cacher/use.sls @@ -6,6 +6,7 @@ qvm-present-id: /etc/qubes/policy.d/50-config-updates.policy: file.prepend: + - header: True - text: - "qubes.UpdatesProxy * @tag:whonix-updatevm @default allow target=sys-whonix" - "qubes.UpdatesProxy * @tag:whonix-updatevm @anyvm deny"