From 49a295dae9ccadc2123c8c910f29ca7cb597d0a7 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Wed, 19 Jun 2024 08:38:56 +0200 Subject: [PATCH] fix: printer formula with conflicting IDs --- salt/sys-print/README.md | 2 +- salt/sys-print/install-client.sls | 2 +- salt/sys-print/install-driver-all.sls | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/sys-print/README.md b/salt/sys-print/README.md index b9015526..56d319f0 100644 --- a/salt/sys-print/README.md +++ b/salt/sys-print/README.md @@ -65,7 +65,7 @@ sudo qubesctl --skip-dom0 --targets=tpl-sys-print state.apply sys-print.install- On the client template: ```sh -sudo qubesctl --skip-dom0 --targets=tpl-QUBE -print state.apply sys-print.install-client +sudo qubesctl --skip-dom0 --targets=tpl-QUBE state.apply sys-print.install-client ``` The client qube requires the split Print service to be enabled: diff --git a/salt/sys-print/install-client.sls b/salt/sys-print/install-client.sls index 157ee92d..730563bb 100644 --- a/salt/sys-print/install-client.sls +++ b/salt/sys-print/install-client.sls @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. SPDX-License-Identifier: AGPL-3.0-or-later #} -"{{ slsdotpath }}-systemd-print-forwarder": +"{{ slsdotpath }}-client-systemd-print-forwarder": file.managed: - name: /usr/lib/systemd/system/qubes-print-forwarder.service - source: salt://{{ slsdotpath }}/files/client/systemd/qubes-print-forwarder.service diff --git a/salt/sys-print/install-driver-all.sls b/salt/sys-print/install-driver-all.sls index 38a32682..748ea949 100644 --- a/salt/sys-print/install-driver-all.sls +++ b/salt/sys-print/install-driver-all.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - sys-print.install -"{{ slsdotpath }}-installed": +"{{ slsdotpath }}-installed-driver-all": pkg.installed: - require: - sls: utils.tools.common.update