From f0ea11480d3ac68549bb276c3c476b53ecd29068 Mon Sep 17 00:00:00 2001 From: 3np <3np@example.com> Date: Wed, 19 Mar 2025 07:10:56 +0000 Subject: [PATCH] fix: reference local sls included by slsdotpath behavior of `.` includes have been changing between salt 3006.x and 3007. This should make qusal work consistently across versions. --- salt/ansible/create.sls | 2 +- salt/ansible/install.sls | 2 +- salt/browser/create.sls | 2 +- salt/browser/install-chrome.sls | 4 ++-- salt/browser/install-chromium.sls | 2 +- salt/browser/install-firefox-esr.sls | 2 +- salt/browser/install-firefox.sls | 4 ++-- salt/browser/install-lynx.sls | 2 +- salt/browser/install-mullvad.sls | 4 ++-- salt/browser/install-w3m.sls | 2 +- salt/browser/install.sls | 2 +- salt/debian-minimal/create.sls | 2 +- salt/debian-xfce/create.sls | 2 +- salt/debian/create.sls | 2 +- salt/dev/configure.sls | 2 +- salt/dev/create.sls | 2 +- salt/dev/init.sls | 6 +++--- salt/dev/install.sls | 2 +- salt/dom0/init.sls | 16 ++++++++-------- salt/electrum/configure-hot.sls | 2 +- salt/electrum/configure.sls | 2 +- salt/electrum/create.sls | 2 +- salt/element/create.sls | 2 +- salt/element/install.sls | 2 +- salt/fedora-minimal/create.sls | 2 +- salt/fedora-minimal/prefs.sls | 2 +- salt/fedora-xfce/create.sls | 2 +- salt/fedora/create.sls | 2 +- salt/fetcher/create.sls | 2 +- salt/kicksecure-minimal/create.sls | 2 +- salt/kicksecure-minimal/kernel-default.sls | 2 +- salt/kicksecure-minimal/kernel-hvm.sls | 2 +- salt/kicksecure-minimal/kernel-pv.sls | 2 +- salt/mail/create.sls | 2 +- salt/media/create.sls | 2 +- salt/mgmt/create.sls | 2 +- salt/mgmt/prefs.sls | 2 +- salt/mirage-builder/create.sls | 2 +- salt/opentofu/create.sls | 2 +- salt/opentofu/install.sls | 2 +- salt/qubes-builder/configure-qusal.sls | 2 +- salt/qubes-builder/create.sls | 2 +- salt/qubes-builder/init.sls | 8 ++++---- salt/qubes-builder/install.sls | 2 +- salt/qubes-builder/prefs.sls | 2 +- salt/reader/create.sls | 2 +- salt/remmina/create.sls | 2 +- salt/signal/create.sls | 2 +- salt/signal/install.sls | 2 +- salt/ssh/create.sls | 2 +- salt/sys-audio/create.sls | 2 +- salt/sys-audio/install-bluetooth.sls | 2 +- salt/sys-audio/install.sls | 2 +- salt/sys-bitcoin/configure-builder-source.sls | 2 +- salt/sys-bitcoin/configure-builder.sls | 2 +- salt/sys-bitcoin/create.sls | 2 +- salt/sys-bitcoin/install-client.sls | 2 +- salt/sys-bitcoin/install-source.sls | 2 +- salt/sys-bitcoin/install.sls | 2 +- salt/sys-cacher/create.sls | 2 +- salt/sys-electrs/configure-builder.sls | 2 +- salt/sys-electrs/create.sls | 2 +- salt/sys-electrs/install-builder.sls | 2 +- salt/sys-electrs/install.sls | 2 +- salt/sys-electrumx/create.sls | 2 +- salt/sys-firewall/create.sls | 2 +- salt/sys-git/create.sls | 2 +- salt/sys-gui-gpu/create.sls | 2 +- salt/sys-gui-vnc/create.sls | 2 +- salt/sys-gui/cancel.sls | 2 +- salt/sys-gui/create.sls | 2 +- salt/sys-net/create.sls | 4 ++-- salt/sys-pgp/create.sls | 2 +- salt/sys-pgp/install-client.sls | 2 +- salt/sys-pgp/prefs.sls | 2 +- salt/sys-print/create.sls | 2 +- salt/sys-rsync/create.sls | 2 +- salt/sys-ssh-agent/create.sls | 2 +- salt/sys-ssh/create.sls | 2 +- salt/sys-syncthing/create.sls | 2 +- salt/sys-syncthing/install-client.sls | 2 +- salt/sys-syncthing/install.sls | 2 +- salt/sys-tailscale/create.sls | 2 +- salt/sys-tailscale/install.sls | 2 +- salt/sys-usb/create.sls | 2 +- salt/sys-usb/install-client-cryptsetup.sls | 2 +- salt/sys-usb/install-client-fido.sls | 2 +- salt/sys-usb/install-client.sls | 4 ++-- salt/sys-wireguard/create.sls | 2 +- salt/terraform/create.sls | 2 +- salt/terraform/install.sls | 2 +- salt/usb/create.sls | 2 +- salt/vault/create.sls | 2 +- salt/video-companion/install-receiver-debug.sls | 2 +- salt/whonix-gateway/create.sls | 2 +- salt/whonix-workstation/create.sls | 2 +- 96 files changed, 113 insertions(+), 113 deletions(-) diff --git a/salt/ansible/create.sls b/salt/ansible/create.sls index 5722cb6..d46f03f 100644 --- a/salt/ansible/create.sls +++ b/salt/ansible/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/ansible/install.sls b/salt/ansible/install.sls index e76d060..4a99142 100644 --- a/salt/ansible/install.sls +++ b/salt/ansible/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update - dotfiles.copy-sh - dotfiles.copy-x11 diff --git a/salt/browser/create.sls b/salt/browser/create.sls index c74b15d..618e42b 100644 --- a/salt/browser/create.sls +++ b/salt/browser/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/browser/install-chrome.sls b/salt/browser/install-chrome.sls index 859a9a2..4f7d8ad 100644 --- a/salt/browser/install-chrome.sls +++ b/salt/browser/install-chrome.sls @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-chrome-repo - - .install-common + - {{ slsdotpath }}.install-chrome-repo + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-avoid-chrome-installing-own-repo": file.touch: diff --git a/salt/browser/install-chromium.sls b/salt/browser/install-chromium.sls index 9128f97..c56962e 100644 --- a/salt/browser/install-chromium.sls +++ b/salt/browser/install-chromium.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-installed-chromium": pkg.installed: diff --git a/salt/browser/install-firefox-esr.sls b/salt/browser/install-firefox-esr.sls index dc4a357..5c5646d 100644 --- a/salt/browser/install-firefox-esr.sls +++ b/salt/browser/install-firefox-esr.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-installed-firefox-esr": pkg.installed: diff --git a/salt/browser/install-firefox.sls b/salt/browser/install-firefox.sls index efc1065..0aea76e 100644 --- a/salt/browser/install-firefox.sls +++ b/salt/browser/install-firefox.sls @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-firefox-repo - - .install-common + - {{ slsdotpath }}.install-firefox-repo + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-installed-firefox": pkg.installed: diff --git a/salt/browser/install-lynx.sls b/salt/browser/install-lynx.sls index 5ffe0af..25755a3 100644 --- a/salt/browser/install-lynx.sls +++ b/salt/browser/install-lynx.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-installed-lynx": pkg.installed: diff --git a/salt/browser/install-mullvad.sls b/salt/browser/install-mullvad.sls index 816c4cb..f1b6755 100644 --- a/salt/browser/install-mullvad.sls +++ b/salt/browser/install-mullvad.sls @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-mullvad-repo - - .install-common + - {{ slsdotpath }}.install-mullvad-repo + - {{ slsdotpath }}.install-common "{{ slsdotpath }}-installed-mullvad": pkg.installed: diff --git a/salt/browser/install-w3m.sls b/salt/browser/install-w3m.sls index 55b93f4..91830ec 100644 --- a/salt/browser/install-w3m.sls +++ b/salt/browser/install-w3m.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common - dotfiles.copy-net "{{ slsdotpath }}-installed-w3m": diff --git a/salt/browser/install.sls b/salt/browser/install.sls index 1b73445..aa807b7 100644 --- a/salt/browser/install.sls +++ b/salt/browser/install.sls @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-chromium + - {{ slsdotpath }}.install-chromium {% endif -%} diff --git a/salt/debian-minimal/create.sls b/salt/debian-minimal/create.sls index 0cc54f5..4b7302e 100644 --- a/salt/debian-minimal/create.sls +++ b/salt/debian-minimal/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/debian-xfce/create.sls b/salt/debian-xfce/create.sls index c81fbee..1770183 100644 --- a/salt/debian-xfce/create.sls +++ b/salt/debian-xfce/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/debian/create.sls b/salt/debian/create.sls index c81fbee..1770183 100644 --- a/salt/debian/create.sls +++ b/salt/debian/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/dev/configure.sls b/salt/dev/configure.sls index b5c74af..60bc40b 100644 --- a/salt/dev/configure.sls +++ b/salt/dev/configure.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .home-cleanup + - {{ slsdotpath }}.home-cleanup - dotfiles.copy-all {% endif -%} diff --git a/salt/dev/create.sls b/salt/dev/create.sls index 8dafc7c..5df942e 100644 --- a/salt/dev/create.sls +++ b/salt/dev/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - sys-net.show-updatevm-origin {% load_yaml as defaults -%} diff --git a/salt/dev/init.sls b/salt/dev/init.sls index 71e1082..87aa883 100644 --- a/salt/dev/init.sls +++ b/salt/dev/init.sls @@ -11,12 +11,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later {# include: {% if grains['id'] == 'dom0' -%} - - .create + - {{ slsdotpath }}.create {% elif grains['id'] == 'tpl-' ~ slsdotpath -%} - - .install + - {{ slsdotpath }}.install {% elif grains['id'] == 'disp-' ~ slsdotpath -%} - utils.tools.zsh.touch-zshrc {% elif grains['id'] == slsdotpath -%} - - .configure + - {{ slsdotpath }}.configure {% endif -%} #} diff --git a/salt/dev/install.sls b/salt/dev/install.sls index c2741a4..5392541 100644 --- a/salt/dev/install.sls +++ b/salt/dev/install.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .home-cleanup + - {{ slsdotpath }}.home-cleanup - dotfiles.copy-all - utils.tools.zsh - sys-pgp.install-client diff --git a/salt/dom0/init.sls b/salt/dom0/init.sls index 2a403b5..c27ed04 100644 --- a/salt/dom0/init.sls +++ b/salt/dom0/init.sls @@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] == 'dom0' -%} include: - - .backup - - .dotfiles - - .helpers - - .install - - .desktop-kde - - .update-settings - - .xorg - - .screenshot + - {{ slsdotpath }}.backup + - {{ slsdotpath }}.dotfiles + - {{ slsdotpath }}.helpers + - {{ slsdotpath }}.install + - {{ slsdotpath }}.desktop-kde + - {{ slsdotpath }}.update-settings + - {{ slsdotpath }}.xorg + - {{ slsdotpath }}.screenshot {% endif -%} diff --git a/salt/electrum/configure-hot.sls b/salt/electrum/configure-hot.sls index c56b556..12f7d92 100644 --- a/salt/electrum/configure-hot.sls +++ b/salt/electrum/configure-hot.sls @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .configure-common + - {{ slsdotpath }}.configure-common {% endif -%} diff --git a/salt/electrum/configure.sls b/salt/electrum/configure.sls index 7517ddb..c85a336 100644 --- a/salt/electrum/configure.sls +++ b/salt/electrum/configure.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .configure-common + - {{ slsdotpath }}.configure-common - whonix-workstation.configure-offline {% endif -%} diff --git a/salt/electrum/create.sls b/salt/electrum/create.sls index 85db5ea..70c91e9 100644 --- a/salt/electrum/create.sls +++ b/salt/electrum/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import "whonix-workstation/template.jinja" as whonix_workstation -%} include: - - .clone + - {{ slsdotpath }}.clone - sys-bitcoin.create {% load_yaml as defaults -%} diff --git a/salt/element/create.sls b/salt/element/create.sls index 6037073..9743e69 100644 --- a/salt/element/create.sls +++ b/salt/element/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/element/install.sls b/salt/element/install.sls index 3d8f863..59564b9 100644 --- a/salt/element/install.sls +++ b/salt/element/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update - sys-audio.install-client diff --git a/salt/fedora-minimal/create.sls b/salt/fedora-minimal/create.sls index c9a00b9..50bd3f0 100644 --- a/salt/fedora-minimal/create.sls +++ b/salt/fedora-minimal/create.sls @@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - fedora.create - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/fedora-minimal/prefs.sls b/salt/fedora-minimal/prefs.sls index b6ef9fe..c45a43b 100644 --- a/salt/fedora-minimal/prefs.sls +++ b/salt/fedora-minimal/prefs.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .create + - {{ slsdotpath }}.create "{{ slsdotpath }}-set-management_dispvm-to-default": qvm.vm: diff --git a/salt/fedora-xfce/create.sls b/salt/fedora-xfce/create.sls index cc6492f..dbfd405 100644 --- a/salt/fedora-xfce/create.sls +++ b/salt/fedora-xfce/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/fedora/create.sls b/salt/fedora/create.sls index d5065b4..40f3ca9 100644 --- a/salt/fedora/create.sls +++ b/salt/fedora/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone "dvm-{{ template.template }}-absent": qvm.absent: diff --git a/salt/fetcher/create.sls b/salt/fetcher/create.sls index f74be97..3f69b0c 100644 --- a/salt/fetcher/create.sls +++ b/salt/fetcher/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/kicksecure-minimal/create.sls b/salt/kicksecure-minimal/create.sls index ebbaa85..d506126 100644 --- a/salt/kicksecure-minimal/create.sls +++ b/salt/kicksecure-minimal/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: {{ template.template }} diff --git a/salt/kicksecure-minimal/kernel-default.sls b/salt/kicksecure-minimal/kernel-default.sls index a5ee5d4..0b082c8 100644 --- a/salt/kicksecure-minimal/kernel-default.sls +++ b/salt/kicksecure-minimal/kernel-default.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: {{ template.template }} diff --git a/salt/kicksecure-minimal/kernel-hvm.sls b/salt/kicksecure-minimal/kernel-hvm.sls index 6bb161b..f1ab321 100644 --- a/salt/kicksecure-minimal/kernel-hvm.sls +++ b/salt/kicksecure-minimal/kernel-hvm.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: {{ template.template }} diff --git a/salt/kicksecure-minimal/kernel-pv.sls b/salt/kicksecure-minimal/kernel-pv.sls index ddfd2e6..20384b2 100644 --- a/salt/kicksecure-minimal/kernel-pv.sls +++ b/salt/kicksecure-minimal/kernel-pv.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone - utils.tools.common.update "{{ slsdotpath }}-installed": diff --git a/salt/mail/create.sls b/salt/mail/create.sls index 9d075d2..2e118c2 100644 --- a/salt/mail/create.sls +++ b/salt/mail/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }}-fetcher diff --git a/salt/media/create.sls b/salt/media/create.sls index 6f74cac..f05c0fd 100644 --- a/salt/media/create.sls +++ b/salt/media/create.sls @@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import "debian-minimal/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/mgmt/create.sls b/salt/mgmt/create.sls index 220cb4b..bf71c00 100644 --- a/salt/mgmt/create.sls +++ b/salt/mgmt/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - fedora.create - - .clone + - {{ slsdotpath }}.clone - fedora-minimal.prefs {% load_yaml as defaults -%} diff --git a/salt/mgmt/prefs.sls b/salt/mgmt/prefs.sls index 73e491b..23ba2af 100644 --- a/salt/mgmt/prefs.sls +++ b/salt/mgmt/prefs.sls @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} include: - - .create + - {{ slsdotpath }}.create "{{ slsdotpath }}-set-qubes-prefs-management_dispvm-to-dvm-{{ slsdotpath }}": cmd.run: diff --git a/salt/mirage-builder/create.sls b/salt/mirage-builder/create.sls index 5b2f26a..1cea8df 100644 --- a/salt/mirage-builder/create.sls +++ b/salt/mirage-builder/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/opentofu/create.sls b/salt/opentofu/create.sls index c62f356..8ce5ab3 100644 --- a/salt/opentofu/create.sls +++ b/salt/opentofu/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/opentofu/install.sls b/salt/opentofu/install.sls index 27ae96e..50e3060 100644 --- a/salt/opentofu/install.sls +++ b/salt/opentofu/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update - sys-ssh-agent.install-client diff --git a/salt/qubes-builder/configure-qusal.sls b/salt/qubes-builder/configure-qusal.sls index 98cf7ca..f572507 100644 --- a/salt/qubes-builder/configure-qusal.sls +++ b/salt/qubes-builder/configure-qusal.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .configure + - {{ slsdotpath }}.configure "{{ slsdotpath }}-makedir-qusal-builder": file.directory: diff --git a/salt/qubes-builder/create.sls b/salt/qubes-builder/create.sls index 2c69073..584bafb 100644 --- a/salt/qubes-builder/create.sls +++ b/salt/qubes-builder/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - fedora-minimal.prefs {% load_yaml as defaults -%} diff --git a/salt/qubes-builder/init.sls b/salt/qubes-builder/init.sls index 2a7887f..ab294db 100644 --- a/salt/qubes-builder/init.sls +++ b/salt/qubes-builder/init.sls @@ -6,11 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: {% if grains['id'] == 'dom0' -%} - - .create + - {{ slsdotpath }}.create {% elif grains['id'] == 'tpl-' ~ slsdotpath -%} - - .install + - {{ slsdotpath }}.install {% elif grains['id'] == 'dvm-' ~ slsdotpath -%} - - .configure-qubes-executor + - {{ slsdotpath }}.configure-qubes-executor {% elif grains['id'] == slsdotpath -%} - - .configure + - {{ slsdotpath }}.configure {% endif -%} diff --git a/salt/qubes-builder/install.sls b/salt/qubes-builder/install.sls index c78482c..d540876 100644 --- a/salt/qubes-builder/install.sls +++ b/salt/qubes-builder/install.sls @@ -18,7 +18,7 @@ include: - sys-pgp.install-client - sys-ssh-agent.install-client - docker.install - - .install-qubes-executor + - {{ slsdotpath }}.install-qubes-executor "{{ slsdotpath }}-installed": pkg.installed: diff --git a/salt/qubes-builder/prefs.sls b/salt/qubes-builder/prefs.sls index 9650569..1e82dd0 100644 --- a/salt/qubes-builder/prefs.sls +++ b/salt/qubes-builder/prefs.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later ## https://github.com/QubesOS/qubes-issues/issues/8806 include: - - .create + - {{ slsdotpath }}.create "{{ slsdotpath }}-set-management_dispvm-to-default": qvm.vm: diff --git a/salt/reader/create.sls b/salt/reader/create.sls index e35388b..b22002e 100644 --- a/salt/reader/create.sls +++ b/salt/reader/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/remmina/create.sls b/salt/remmina/create.sls index 6d4109a..f039033 100644 --- a/salt/remmina/create.sls +++ b/salt/remmina/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/signal/create.sls b/salt/signal/create.sls index 9963a9e..d84d35c 100644 --- a/salt/signal/create.sls +++ b/salt/signal/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/signal/install.sls b/salt/signal/install.sls index 48b83fb..65a4edd 100644 --- a/salt/signal/install.sls +++ b/salt/signal/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update - utils.tools.xfce - dotfiles.copy-x11 diff --git a/salt/ssh/create.sls b/salt/ssh/create.sls index f1649c2..83e2fa3 100644 --- a/salt/ssh/create.sls +++ b/salt/ssh/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-audio/create.sls b/salt/sys-audio/create.sls index 531e4e2..4c96880 100644 --- a/salt/sys-audio/create.sls +++ b/salt/sys-audio/create.sls @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-audio/install-bluetooth.sls b/salt/sys-audio/install-bluetooth.sls index b526496..4df01d9 100644 --- a/salt/sys-audio/install-bluetooth.sls +++ b/salt/sys-audio/install-bluetooth.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .install + - {{ slsdotpath }}.install - sys-usb.install-client-proxy "{{ slsdotpath }}-bluetooth-installed": diff --git a/salt/sys-audio/install.sls b/salt/sys-audio/install.sls index 92a465c..07a089c 100644 --- a/salt/sys-audio/install.sls +++ b/salt/sys-audio/install.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - sys-usb.install-client-proxy - - .install-client + - {{ slsdotpath }}.install-client "{{ slsdotpath }}-installed": pkg.installed: diff --git a/salt/sys-bitcoin/configure-builder-source.sls b/salt/sys-bitcoin/configure-builder-source.sls index cd6661c..1516299 100644 --- a/salt/sys-bitcoin/configure-builder-source.sls +++ b/salt/sys-bitcoin/configure-builder-source.sls @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% set bitcoin_tag = 'v' ~ version.version -%} include: - - .configure-builder-common + - {{ slsdotpath }}.configure-builder-common "{{ slsdotpath }}-source-makedir-src": file.directory: diff --git a/salt/sys-bitcoin/configure-builder.sls b/salt/sys-bitcoin/configure-builder.sls index 26c7798..21a69eb 100644 --- a/salt/sys-bitcoin/configure-builder.sls +++ b/salt/sys-bitcoin/configure-builder.sls @@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% set bitcoin_url_shasum_sig = bitcoin_url_dir ~ bitcoin_file_shasum_sig -%} include: - - .configure-builder-common + - {{ slsdotpath }}.configure-builder-common "{{ slsdotpath }}-remove-failed-download-or-verification": file.absent: diff --git a/salt/sys-bitcoin/create.sls b/salt/sys-bitcoin/create.sls index 252ed68..03a0696 100644 --- a/salt/sys-bitcoin/create.sls +++ b/salt/sys-bitcoin/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import "whonix-gateway/template.jinja" as whonix_gateway %} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: {{ slsdotpath }}-gateway diff --git a/salt/sys-bitcoin/install-client.sls b/salt/sys-bitcoin/install-client.sls index 4923cbc..d8a9785 100644 --- a/salt/sys-bitcoin/install-client.sls +++ b/salt/sys-bitcoin/install-client.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common - dev.home-cleanup - dotfiles.copy-x11 - dotfiles.copy-sh diff --git a/salt/sys-bitcoin/install-source.sls b/salt/sys-bitcoin/install-source.sls index 1676418..dd5c29b 100644 --- a/salt/sys-bitcoin/install-source.sls +++ b/salt/sys-bitcoin/install-source.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .install-common + - {{ slsdotpath }}.install-common - dotfiles.copy-ssh - dotfiles.copy-git - sys-git.install-client diff --git a/salt/sys-bitcoin/install.sls b/salt/sys-bitcoin/install.sls index 853dce1..292e5ec 100644 --- a/salt/sys-bitcoin/install.sls +++ b/salt/sys-bitcoin/install.sls @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-common + - {{ slsdotpath }}.install-common {% endif -%} diff --git a/salt/sys-cacher/create.sls b/salt/sys-cacher/create.sls index a9ca416..b6cacac 100644 --- a/salt/sys-cacher/create.sls +++ b/salt/sys-cacher/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - browser.create {% load_yaml as defaults -%} diff --git a/salt/sys-electrs/configure-builder.sls b/salt/sys-electrs/configure-builder.sls index aeff461..fc053b5 100644 --- a/salt/sys-electrs/configure-builder.sls +++ b/salt/sys-electrs/configure-builder.sls @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .configure-builder-source + - {{ slsdotpath }}.configure-builder-source {% endif -%} diff --git a/salt/sys-electrs/create.sls b/salt/sys-electrs/create.sls index b75a044..a006a7e 100644 --- a/salt/sys-electrs/create.sls +++ b/salt/sys-electrs/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - sys-bitcoin.create {% load_yaml as defaults -%} diff --git a/salt/sys-electrs/install-builder.sls b/salt/sys-electrs/install-builder.sls index eeef3c2..abb69c2 100644 --- a/salt/sys-electrs/install-builder.sls +++ b/salt/sys-electrs/install-builder.sls @@ -9,6 +9,6 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md {% if grains['nodename'] != 'dom0' -%} include: - - .install-builder-source + - {{ slsdotpath }}.install-builder-source {% endif -%} diff --git a/salt/sys-electrs/install.sls b/salt/sys-electrs/install.sls index 39791c4..0de5358 100644 --- a/salt/sys-electrs/install.sls +++ b/salt/sys-electrs/install.sls @@ -9,6 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later ## ElectRS does not provide official binaries. This state exists to be the ## default installation. include: - - .install-source + - {{ slsdotpath }}.install-source {% endif -%} diff --git a/salt/sys-electrumx/create.sls b/salt/sys-electrumx/create.sls index 3e5738e..b60e015 100644 --- a/salt/sys-electrumx/create.sls +++ b/salt/sys-electrumx/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - sys-bitcoin.create {% load_yaml as defaults -%} diff --git a/salt/sys-firewall/create.sls b/salt/sys-firewall/create.sls index 7d7a9c6..71c0fa1 100644 --- a/salt/sys-firewall/create.sls +++ b/salt/sys-firewall/create.sls @@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% endif -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-git/create.sls b/salt/sys-git/create.sls index a1325da..dab84d7 100644 --- a/salt/sys-git/create.sls +++ b/salt/sys-git/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-gui-gpu/create.sls b/salt/sys-gui-gpu/create.sls index cafce44..4c2fd5b 100644 --- a/salt/sys-gui-gpu/create.sls +++ b/salt/sys-gui-gpu/create.sls @@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-2.0-only {%- from "qvm/template-gui.jinja" import gui_common -%} include: - - .clone + - {{ slsdotpath }}.clone "{{ slsdotpath }}-installed": pkg.installed: diff --git a/salt/sys-gui-vnc/create.sls b/salt/sys-gui-vnc/create.sls index 3fa61f2..f0bcc41 100644 --- a/salt/sys-gui-vnc/create.sls +++ b/salt/sys-gui-vnc/create.sls @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-only {%- from "qvm/template-gui.jinja" import gui_common -%} include: - - .clone + - {{ slsdotpath }}.clone {% if 'psu' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui-vnc:dummy-modules', []) %} "{{ slsdotpath }}-installed": diff --git a/salt/sys-gui/cancel.sls b/salt/sys-gui/cancel.sls index 049671c..8ad44d2 100644 --- a/salt/sys-gui/cancel.sls +++ b/salt/sys-gui/cancel.sls @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} include: - - .cancel-common + - {{ slsdotpath }}.cancel-common "{{ slsdotpath }}-disable-autostart": qvm.prefs: diff --git a/salt/sys-gui/create.sls b/salt/sys-gui/create.sls index ea7a50f..8870ed4 100644 --- a/salt/sys-gui/create.sls +++ b/salt/sys-gui/create.sls @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-only {%- from "qvm/template-gui.jinja" import gui_common -%} include: - - .clone + - {{ slsdotpath }}.clone {% if 'psu' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) or 'backlight' in salt['pillar.get']('qvm:sys-gui:dummy-modules', []) %} "{{ slsdotpath }}-installed": diff --git a/salt/sys-net/create.sls b/salt/sys-net/create.sls index 70b55a9..275d2a1 100644 --- a/salt/sys-net/create.sls +++ b/salt/sys-net/create.sls @@ -9,8 +9,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% set net_pcidevs = salt['grains.get']('pci_net_devs', []) -%} include: - - .clone - - .show-updatevm-origin + - {{ slsdotpath }}.clone + - {{ slsdotpath }}.show-updatevm-origin {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-pgp/create.sls b/salt/sys-pgp/create.sls index 8fddeee..2e0c92b 100644 --- a/salt/sys-pgp/create.sls +++ b/salt/sys-pgp/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - fedora-minimal.prefs {% load_yaml as defaults -%} diff --git a/salt/sys-pgp/install-client.sls b/salt/sys-pgp/install-client.sls index 323a08f..bc1fa10 100644 --- a/salt/sys-pgp/install-client.sls +++ b/salt/sys-pgp/install-client.sls @@ -7,6 +7,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install + - {{ slsdotpath }}.install {% endif -%} diff --git a/salt/sys-pgp/prefs.sls b/salt/sys-pgp/prefs.sls index 74627a7..0a842ef 100644 --- a/salt/sys-pgp/prefs.sls +++ b/salt/sys-pgp/prefs.sls @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later #} include: - - .create + - {{ slsdotpath }}.create "{{ slsdotpath }}-set-management_dispvm-to-default": qvm.vm: diff --git a/salt/sys-print/create.sls b/salt/sys-print/create.sls index 3bb4f0b..3d2a102 100644 --- a/salt/sys-print/create.sls +++ b/salt/sys-print/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-rsync/create.sls b/salt/sys-rsync/create.sls index 84ba6ec..85b5615 100644 --- a/salt/sys-rsync/create.sls +++ b/salt/sys-rsync/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-ssh-agent/create.sls b/salt/sys-ssh-agent/create.sls index 54bc674..f4f2165 100644 --- a/salt/sys-ssh-agent/create.sls +++ b/salt/sys-ssh-agent/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-ssh/create.sls b/salt/sys-ssh/create.sls index d6ca3d6..00aa604 100644 --- a/salt/sys-ssh/create.sls +++ b/salt/sys-ssh/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-syncthing/create.sls b/salt/sys-syncthing/create.sls index 2084381..9380afc 100644 --- a/salt/sys-syncthing/create.sls +++ b/salt/sys-syncthing/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - browser.create - dom0.port-forward diff --git a/salt/sys-syncthing/install-client.sls b/salt/sys-syncthing/install-client.sls index 6aa9e79..91029e3 100644 --- a/salt/sys-syncthing/install-client.sls +++ b/salt/sys-syncthing/install-client.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['os_family']|lower == 'debian' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update {% endif -%} diff --git a/salt/sys-syncthing/install.sls b/salt/sys-syncthing/install.sls index c594e19..a8ef14c 100644 --- a/salt/sys-syncthing/install.sls +++ b/salt/sys-syncthing/install.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: {% if grains['os_family']|lower == 'debian' -%} - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update {% endif -%} - utils.tools.xfce diff --git a/salt/sys-tailscale/create.sls b/salt/sys-tailscale/create.sls index 0952852..3d164bd 100644 --- a/salt/sys-tailscale/create.sls +++ b/salt/sys-tailscale/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/sys-tailscale/install.sls b/salt/sys-tailscale/install.sls index 6876aa4..8ccbe23 100644 --- a/salt/sys-tailscale/install.sls +++ b/salt/sys-tailscale/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update "{{ slsdotpath }}-systemd": diff --git a/salt/sys-usb/create.sls b/salt/sys-usb/create.sls index f2b2292..eb33245 100644 --- a/salt/sys-usb/create.sls +++ b/salt/sys-usb/create.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone - utils.tools.common.update - qvm.hide-usb-from-dom0 diff --git a/salt/sys-usb/install-client-cryptsetup.sls b/salt/sys-usb/install-client-cryptsetup.sls index a760af1..be9a0ef 100644 --- a/salt/sys-usb/install-client-cryptsetup.sls +++ b/salt/sys-usb/install-client-cryptsetup.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .install-client-proxy + - {{ slsdotpath }}.install-client-proxy "{{ slsdotpath }}-installed-cryptsetup": pkg.installed: diff --git a/salt/sys-usb/install-client-fido.sls b/salt/sys-usb/install-client-fido.sls index 5d55bf0..4408257 100644 --- a/salt/sys-usb/install-client-fido.sls +++ b/salt/sys-usb/install-client-fido.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .install-client-proxy + - {{ slsdotpath }}.install-client-proxy "{{ slsdotpath }}-installed-fido": pkg.installed: diff --git a/salt/sys-usb/install-client.sls b/salt/sys-usb/install-client.sls index 87a8d97..807d359 100644 --- a/salt/sys-usb/install-client.sls +++ b/salt/sys-usb/install-client.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-client-cryptsetup - - .install-client-fido + - {{ slsdotpath }}.install-client-cryptsetup + - {{ slsdotpath }}.install-client-fido {% endif -%} diff --git a/salt/sys-wireguard/create.sls b/salt/sys-wireguard/create.sls index eec6dc7..2698491 100644 --- a/salt/sys-wireguard/create.sls +++ b/salt/sys-wireguard/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/terraform/create.sls b/salt/terraform/create.sls index c62f356..8ce5ab3 100644 --- a/salt/terraform/create.sls +++ b/salt/terraform/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/terraform/install.sls b/salt/terraform/install.sls index 4f90678..288a284 100644 --- a/salt/terraform/install.sls +++ b/salt/terraform/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} include: - - .install-repo + - {{ slsdotpath }}.install-repo - utils.tools.common.update - sys-ssh-agent.install-client diff --git a/salt/usb/create.sls b/salt/usb/create.sls index e8a5fc9..a33b066 100644 --- a/salt/usb/create.sls +++ b/salt/usb/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/vault/create.sls b/salt/vault/create.sls index 3d19ef6..8845c1f 100644 --- a/salt/vault/create.sls +++ b/salt/vault/create.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- from "qvm/template.jinja" import load -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: tpl-{{ slsdotpath }} diff --git a/salt/video-companion/install-receiver-debug.sls b/salt/video-companion/install-receiver-debug.sls index a17fc0b..92bfd99 100644 --- a/salt/video-companion/install-receiver-debug.sls +++ b/salt/video-companion/install-receiver-debug.sls @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later include: - utils.tools.common.update - - .install-receiver + - {{ slsdotpath }}.install-receiver "{{ slsdotpath }}-receiver-debug-installed": pkg.installed: diff --git a/salt/whonix-gateway/create.sls b/salt/whonix-gateway/create.sls index c45fb41..dc073f9 100644 --- a/salt/whonix-gateway/create.sls +++ b/salt/whonix-gateway/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone {% load_yaml as defaults -%} name: {{ template.template }} diff --git a/salt/whonix-workstation/create.sls b/salt/whonix-workstation/create.sls index 76dbbf7..279255e 100644 --- a/salt/whonix-workstation/create.sls +++ b/salt/whonix-workstation/create.sls @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {%- import slsdotpath ~ "/template.jinja" as template -%} include: - - .clone + - {{ slsdotpath }}.clone - whonix-gateway.create {% load_yaml as defaults -%}