diff --git a/.gitignore b/.gitignore index 91c10b9..bbd70ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: CC0-1.0 +# vim: nospell qusal/qubesos-github-io qusal/sys-audio +qusal/sys-gui qusal/sys-wireguard qusal/sys-syncthing qusal/sys-rsync -qusal/sys-ssh +qusal/sys-sshfs +qusal/sys-mirage-firewall diff --git a/.gitmodules b/.gitmodules index 2618641..7c9d210 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: CC0-1.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a4ddfc..7061194 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/.reuse/dep5 b/.reuse/dep5 index a6591ee..9bcc0c0 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -1,10 +1,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: qusal -Upstream-Contact: Benjamin Grande Miranda de Sousa +Upstream-Contact: Benjamin Grande M. S. Source: https://github.com/ben-grande/qusal Files: */README.md -Copyright: 2023 Qusal contributors +Copyright: 2023 Benjamin Grande M. S. License: CC-BY-SA-4.0 Files: qusal/ansible/files/repo/* @@ -38,12 +38,4 @@ Copyright: The Qubes OS Project Simon Gaiser License: CC0-1.0 -Files: qusal/dotfiles/files/git/.config/git/message -Copyright: 2023 Qusal contributors -License: CC0-1.0 - -Files: qusal/dotfiles/files/sh/.config/less/lesskey-old -Copyright: 2023 Qusal contributors -License: GPL-3.0-or-later - # vim: ft=debcopyright diff --git a/.salt-lint b/.salt-lint index a340f27..076cce7 100644 --- a/.salt-lint +++ b/.salt-lint @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e64a88d..3614fc4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ diff --git a/COPYING b/COPYING deleted file mode 100644 index d12d106..0000000 --- a/COPYING +++ /dev/null @@ -1,15 +0,0 @@ -Qusal - Salt Formulas for Qubes OS -Copyright (C) 2023 Qusal contributors - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . diff --git a/README.md b/README.md index 3774a2f..308f78c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -79,6 +79,12 @@ The RPM Spec is not ready, don't try it unless for development. Qusal is now installed. Please read the README.md of each project for further information on how to install the desired package. +The intended behaviour is to enforce the state of qubes and their services. If +you modify the qubes and their services and apply the state again, there is a +good chance your choices will be overwritten. To enforce your state, +declaratively specify the desired state, do not do it manually, we are past +that. + Qubes global settings (qubes-prefs) that will be managed: - **clockvm**: disp-sys-net, sys-net @@ -113,8 +119,6 @@ a companion `.license` or in `.reuse/dep5`. Here is a brief summary as of October 2023: -- All original source code is licensed under GPL-3.0-or-later. -- All documentation is licensed under CC-BY-SA-4.0. -- Some configuration and data files are licensed under CC0-1.0. -- Some borrowed code (`qusal/dotfiles/`) is licenses under BSD-2-Clause, - CC-BY-SA-4.0, GPL-2.0-only, GPL-3.0-only, MIT, Vim. +- Source code is licensed under GPL-3.0-or-later; +- Documentation is licensed under CC-BY-SA-4.0; and +- Configuration and data files are licensed under CC0-1.0. diff --git a/minion.d/qusal.conf b/minion.d/qusal.conf index 0485936..99907bd 100644 --- a/minion.d/qusal.conf +++ b/minion.d/qusal.conf @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: CC0-1.0 diff --git a/qusal/ansible/clone.sls b/qusal/ansible/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/ansible/clone.sls +++ b/qusal/ansible/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/clone.top b/qusal/ansible/clone.top index 0c3c8ce..1fd6bc7 100644 --- a/qusal/ansible/clone.top +++ b/qusal/ansible/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/configure-minion.sls b/qusal/ansible/configure-minion.sls index 3a8d64a..f4186d3 100644 --- a/qusal/ansible/configure-minion.sls +++ b/qusal/ansible/configure-minion.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/configure-minion.top b/qusal/ansible/configure-minion.top index 3fe2b8c..7d30beb 100644 --- a/qusal/ansible/configure-minion.top +++ b/qusal/ansible/configure-minion.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/configure.sls b/qusal/ansible/configure.sls index b3eaf7c..c13c3e3 100644 --- a/qusal/ansible/configure.sls +++ b/qusal/ansible/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/configure.top b/qusal/ansible/configure.top index 3d24073..70ee990 100644 --- a/qusal/ansible/configure.top +++ b/qusal/ansible/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/create.sls b/qusal/ansible/create.sls index 9f9b49f..35876eb 100644 --- a/qusal/ansible/create.sls +++ b/qusal/ansible/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/ansible/create.top b/qusal/ansible/create.top index b913d18..9f67ce4 100644 --- a/qusal/ansible/create.top +++ b/qusal/ansible/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/files/minion/99-sshd-ansible.conf b/qusal/ansible/files/minion/99-sshd-ansible.conf index 29938bf..ad36b11 100644 --- a/qusal/ansible/files/minion/99-sshd-ansible.conf +++ b/qusal/ansible/files/minion/99-sshd-ansible.conf @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/ansible/files/policy/default.policy b/qusal/ansible/files/policy/default.policy index 1d62249..f0bb288 100644 --- a/qusal/ansible/files/policy/default.policy +++ b/qusal/ansible/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/ansible/files/server/99-ssh-ansible.conf b/qusal/ansible/files/server/99-ssh-ansible.conf index a61a875..bc378d3 100644 --- a/qusal/ansible/files/server/99-ssh-ansible.conf +++ b/qusal/ansible/files/server/99-ssh-ansible.conf @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/ansible/init.top b/qusal/ansible/init.top index 0fb3f56..9051272 100644 --- a/qusal/ansible/init.top +++ b/qusal/ansible/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/install.sls b/qusal/ansible/install.sls index ec27c6f..81ff350 100644 --- a/qusal/ansible/install.sls +++ b/qusal/ansible/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ansible/install.top b/qusal/ansible/install.top index 2dbd04a..5e2289a 100644 --- a/qusal/ansible/install.top +++ b/qusal/ansible/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/appmenus.sls b/qusal/browser/appmenus.sls index 42bafd0..7b3e9c0 100644 --- a/qusal/browser/appmenus.sls +++ b/qusal/browser/appmenus.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/appmenus.top b/qusal/browser/appmenus.top index ca0f514..f59d22a 100644 --- a/qusal/browser/appmenus.top +++ b/qusal/browser/appmenus.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/clone.sls b/qusal/browser/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/browser/clone.sls +++ b/qusal/browser/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/clone.top b/qusal/browser/clone.top index be28583..c545b0d 100644 --- a/qusal/browser/clone.top +++ b/qusal/browser/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/create.sls b/qusal/browser/create.sls index 327f400..b488d85 100644 --- a/qusal/browser/create.sls +++ b/qusal/browser/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/browser/create.top b/qusal/browser/create.top index ff0fe48..a627e41 100644 --- a/qusal/browser/create.top +++ b/qusal/browser/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/init.top b/qusal/browser/init.top index cac5376..b38cc84 100644 --- a/qusal/browser/init.top +++ b/qusal/browser/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-chrome.sls b/qusal/browser/install-chrome.sls index 4511b96..9184f80 100644 --- a/qusal/browser/install-chrome.sls +++ b/qusal/browser/install-chrome.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-chrome.top b/qusal/browser/install-chrome.top index 6e3435b..2ef8d58 100644 --- a/qusal/browser/install-chrome.top +++ b/qusal/browser/install-chrome.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-chromium.sls b/qusal/browser/install-chromium.sls index ab5e70b..ad4be34 100644 --- a/qusal/browser/install-chromium.sls +++ b/qusal/browser/install-chromium.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-chromium.top b/qusal/browser/install-chromium.top index 5a92018..9a9fc3c 100644 --- a/qusal/browser/install-chromium.top +++ b/qusal/browser/install-chromium.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-common.sls b/qusal/browser/install-common.sls index 0d2b847..028908b 100644 --- a/qusal/browser/install-common.sls +++ b/qusal/browser/install-common.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-common.top b/qusal/browser/install-common.top index 810e3e7..761b449 100644 --- a/qusal/browser/install-common.top +++ b/qusal/browser/install-common.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-firefox.sls b/qusal/browser/install-firefox.sls index 5ea223d..8bc2153 100644 --- a/qusal/browser/install-firefox.sls +++ b/qusal/browser/install-firefox.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-firefox.top b/qusal/browser/install-firefox.top index de6f1f6..1349482 100644 --- a/qusal/browser/install-firefox.top +++ b/qusal/browser/install-firefox.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-lynx.sls b/qusal/browser/install-lynx.sls index e194967..3f717c9 100644 --- a/qusal/browser/install-lynx.sls +++ b/qusal/browser/install-lynx.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-lynx.top b/qusal/browser/install-lynx.top index cc32828..14d74ac 100644 --- a/qusal/browser/install-lynx.top +++ b/qusal/browser/install-lynx.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-w3m.sls b/qusal/browser/install-w3m.sls index b37aeba..438a1aa 100644 --- a/qusal/browser/install-w3m.sls +++ b/qusal/browser/install-w3m.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install-w3m.top b/qusal/browser/install-w3m.top index 88281e9..694fe32 100644 --- a/qusal/browser/install-w3m.top +++ b/qusal/browser/install-w3m.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install.sls b/qusal/browser/install.sls index 204d70c..a6af160 100644 --- a/qusal/browser/install.sls +++ b/qusal/browser/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/browser/install.top b/qusal/browser/install.top index 0793ca5..8075578 100644 --- a/qusal/browser/install.top +++ b/qusal/browser/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/clone.sls b/qusal/debian-minimal/clone.sls index 8a9c05e..7fc8751 100644 --- a/qusal/debian-minimal/clone.sls +++ b/qusal/debian-minimal/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/clone.top b/qusal/debian-minimal/clone.top index ddf59b1..ac6c7f5 100644 --- a/qusal/debian-minimal/clone.top +++ b/qusal/debian-minimal/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/create.sls b/qusal/debian-minimal/create.sls index 555ec8b..55498f8 100644 --- a/qusal/debian-minimal/create.sls +++ b/qusal/debian-minimal/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + {%- import slsdotpath ~ "/template.jinja" as template -%} include: diff --git a/qusal/debian-minimal/create.top b/qusal/debian-minimal/create.top index bb0f101..9ddc9b8 100644 --- a/qusal/debian-minimal/create.top +++ b/qusal/debian-minimal/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/init.top b/qusal/debian-minimal/init.top index 97ebc09..59f1ff4 100644 --- a/qusal/debian-minimal/init.top +++ b/qusal/debian-minimal/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/install.sls b/qusal/debian-minimal/install.sls index c939399..fc0395b 100644 --- a/qusal/debian-minimal/install.sls +++ b/qusal/debian-minimal/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/install.top b/qusal/debian-minimal/install.top index 56f22d5..d5c608a 100644 --- a/qusal/debian-minimal/install.top +++ b/qusal/debian-minimal/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian-minimal/template.jinja b/qusal/debian-minimal/template.jinja index 711ab9e..fd916f3 100644 --- a/qusal/debian-minimal/template.jinja +++ b/qusal/debian-minimal/template.jinja @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/clone.sls b/qusal/debian/clone.sls index 8a9c05e..7fc8751 100644 --- a/qusal/debian/clone.sls +++ b/qusal/debian/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/clone.top b/qusal/debian/clone.top index ef89ce2..53e9504 100644 --- a/qusal/debian/clone.top +++ b/qusal/debian/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/create.sls b/qusal/debian/create.sls index 41ba109..5a6c6c3 100644 --- a/qusal/debian/create.sls +++ b/qusal/debian/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + {%- import slsdotpath ~ "/template.jinja" as template -%} include: diff --git a/qusal/debian/create.top b/qusal/debian/create.top index 4524a8a..6080eee 100644 --- a/qusal/debian/create.top +++ b/qusal/debian/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/init.top b/qusal/debian/init.top index 109736c..c37633a 100644 --- a/qusal/debian/init.top +++ b/qusal/debian/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/install.sls b/qusal/debian/install.sls index c23907c..7809d24 100644 --- a/qusal/debian/install.sls +++ b/qusal/debian/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/install.top b/qusal/debian/install.top index c9826c5..27b828c 100644 --- a/qusal/debian/install.top +++ b/qusal/debian/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/debian/template.jinja b/qusal/debian/template.jinja index 64a3684..3a7a698 100644 --- a/qusal/debian/template.jinja +++ b/qusal/debian/template.jinja @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/clone.sls b/qusal/dev/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/dev/clone.sls +++ b/qusal/dev/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/clone.top b/qusal/dev/clone.top index 6362834..ae0e5e4 100644 --- a/qusal/dev/clone.top +++ b/qusal/dev/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/configure.sls b/qusal/dev/configure.sls index 724800f..83c7605 100644 --- a/qusal/dev/configure.sls +++ b/qusal/dev/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/create.sls b/qusal/dev/create.sls index 3d91734..297a451 100644 --- a/qusal/dev/create.sls +++ b/qusal/dev/create.sls @@ -1,14 +1,14 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone -{%- from "qvm/template.jinja" import load -%} - {% load_yaml as defaults -%} name: {{ slsdotpath }} force: True @@ -20,7 +20,6 @@ present: prefs: - template: tpl-{{ slsdotpath }} - label: purple -- netvm: "" - vpus: 1 - memory: 400 - maxmem: 600 @@ -47,7 +46,6 @@ present: prefs: - template: tpl-{{ slsdotpath }} - label: red -- netvm: "" - vpus: 1 - memory: 400 - maxmem: 600 diff --git a/qusal/dev/create.top b/qusal/dev/create.top index abbe880..17e8612 100644 --- a/qusal/dev/create.top +++ b/qusal/dev/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/home-cleanup.sls b/qusal/dev/home-cleanup.sls index 275dce0..a5c091a 100644 --- a/qusal/dev/home-cleanup.sls +++ b/qusal/dev/home-cleanup.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/home-cleanup.top b/qusal/dev/home-cleanup.top index 17ee3dd..6d71ac0 100644 --- a/qusal/dev/home-cleanup.top +++ b/qusal/dev/home-cleanup.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/init.sls b/qusal/dev/init.sls index 6923c05..7e64397 100644 --- a/qusal/dev/init.sls +++ b/qusal/dev/init.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/init.top b/qusal/dev/init.top index b30cb70..5aa2cf2 100644 --- a/qusal/dev/init.top +++ b/qusal/dev/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install-python-tools.sls b/qusal/dev/install-python-tools.sls index dc04a35..5f4d56b 100644 --- a/qusal/dev/install-python-tools.sls +++ b/qusal/dev/install-python-tools.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install-python-tools.top b/qusal/dev/install-python-tools.top index aa70904..64db64b 100644 --- a/qusal/dev/install-python-tools.top +++ b/qusal/dev/install-python-tools.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install-salt-tools.sls b/qusal/dev/install-salt-tools.sls index 5e5a56d..7f56500 100644 --- a/qusal/dev/install-salt-tools.sls +++ b/qusal/dev/install-salt-tools.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install-salt-tools.top b/qusal/dev/install-salt-tools.top index 6194a7f..52df048 100644 --- a/qusal/dev/install-salt-tools.top +++ b/qusal/dev/install-salt-tools.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install.sls b/qusal/dev/install.sls index 18836fd..228850b 100644 --- a/qusal/dev/install.sls +++ b/qusal/dev/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dev/install.top b/qusal/dev/install.top index 1446814..5d393d5 100644 --- a/qusal/dev/install.top +++ b/qusal/dev/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/docker/configure.sls b/qusal/docker/configure.sls index 2c43d29..16b1b6f 100644 --- a/qusal/docker/configure.sls +++ b/qusal/docker/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/docker/configure.top b/qusal/docker/configure.top index 2529cf7..b680fff 100644 --- a/qusal/docker/configure.top +++ b/qusal/docker/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/docker/init.top b/qusal/docker/init.top index cb0865a..a243816 100644 --- a/qusal/docker/init.top +++ b/qusal/docker/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/docker/install.sls b/qusal/docker/install.sls index d92bd4a..213f8ba 100644 --- a/qusal/docker/install.sls +++ b/qusal/docker/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/docker/install.top b/qusal/docker/install.top index fa43d1e..b9ed3ef 100644 --- a/qusal/docker/install.top +++ b/qusal/docker/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/backup.sls b/qusal/dom0/backup.sls index d691c40..7e15f04 100644 --- a/qusal/dom0/backup.sls +++ b/qusal/dom0/backup.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} @@ -19,3 +19,4 @@ SPDX-License-Identifier: GPL-3.0-or-later - mode: '0755' - user: root - group: root + - replace: False diff --git a/qusal/dom0/backup.top b/qusal/dom0/backup.top index ade6aa3..b7f1d5e 100644 --- a/qusal/dom0/backup.top +++ b/qusal/dom0/backup.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/dotfiles.sls b/qusal/dom0/dotfiles.sls index 6aac8e1..f41d20f 100644 --- a/qusal/dom0/dotfiles.sls +++ b/qusal/dom0/dotfiles.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/dotfiles.top b/qusal/dom0/dotfiles.top index efcf7ff..e93b47f 100644 --- a/qusal/dom0/dotfiles.top +++ b/qusal/dom0/dotfiles.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier index 76c0469..eadcfac 100755 --- a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier +++ b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2018 Oded Arbel -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later @@ -31,9 +31,9 @@ while read -r _ _ _ _ _ path interface member; do test "$member" = "$signal" || continue id="$(qdbus "$service" "$path" "$interface.CurrentActivity")" name="$(qdbus "$service" "$path" "$interface.ActivityName" "$id")" - if command -v kdialog; then + if command -v kdialog >/dev/null; then kdialog --title "Activity: $name" --passivepopup "Switched Activities" 3 - elif command -v notify-send; then + elif command -v notify-send >/dev/null; then notify-send -u normal -t 3000 "Activity: $name" "Switched activities" fi done diff --git a/qusal/dom0/files/autostart/xprofile.desktop b/qusal/dom0/files/autostart/xprofile.desktop index a9a60a2..7bbe00b 100644 --- a/qusal/dom0/files/autostart/xprofile.desktop +++ b/qusal/dom0/files/autostart/xprofile.desktop @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dom0/files/backup/qusal.conf b/qusal/dom0/files/backup/qusal.conf index ca7868c..fb8564e 100644 --- a/qusal/dom0/files/backup/qusal.conf +++ b/qusal/dom0/files/backup/qusal.conf @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dom0/files/bin/qubes-kde-win-rules b/qusal/dom0/files/bin/qubes-kde-win-rules index 68d0ff1..232e3e7 100755 --- a/qusal/dom0/files/bin/qubes-kde-win-rules +++ b/qusal/dom0/files/bin/qubes-kde-win-rules @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dom0/files/bin/qvm-backup-find-last b/qusal/dom0/files/bin/qvm-backup-find-last index 91c660c..7830731 100755 --- a/qusal/dom0/files/bin/qvm-backup-find-last +++ b/qusal/dom0/files/bin/qvm-backup-find-last @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh index 3265b73..6c6f81b 100755 --- a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh +++ b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh @@ -1,12 +1,14 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2020 The Qubes OS Project +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later ## Use Qubes provided menu instead of the default one. -case "$XDG_SESSION_DESKTOP" in +case "${XDG_SESSION_DESKTOP-}" in KDE|plasma) XDG_MENU_PREFIX="kf5-";; *) XDG_MENU_PREFIX="qubes-";; esac + export XDG_MENU_PREFIX diff --git a/qusal/dom0/init.sls b/qusal/dom0/init.sls index 6d337ed..56586ef 100644 --- a/qusal/dom0/init.sls +++ b/qusal/dom0/init.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/init.top b/qusal/dom0/init.top index 5a2a24c..71fe719 100644 --- a/qusal/dom0/init.top +++ b/qusal/dom0/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/install.sls b/qusal/dom0/install.sls index 3fdcc66..b4d60a7 100644 --- a/qusal/dom0/install.sls +++ b/qusal/dom0/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/install.top b/qusal/dom0/install.top index 4fb76ad..975624f 100644 --- a/qusal/dom0/install.top +++ b/qusal/dom0/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/kde.sls b/qusal/dom0/kde.sls index 29c0e8d..560f0ec 100644 --- a/qusal/dom0/kde.sls +++ b/qusal/dom0/kde.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/kde.top b/qusal/dom0/kde.top index ffd664e..729acdb 100644 --- a/qusal/dom0/kde.top +++ b/qusal/dom0/kde.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/xorg.sls b/qusal/dom0/xorg.sls index ebb476f..5ac1667 100644 --- a/qusal/dom0/xorg.sls +++ b/qusal/dom0/xorg.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dom0/xorg.top b/qusal/dom0/xorg.top index 8f3fcf7..bf851a3 100644 --- a/qusal/dom0/xorg.top +++ b/qusal/dom0/xorg.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/dotfiles b/qusal/dotfiles index 3e87d99..edd1ac0 160000 --- a/qusal/dotfiles +++ b/qusal/dotfiles @@ -1 +1 @@ -Subproject commit 3e87d99fdc0c5ca477ccf0952f70a1ca82c8c696 +Subproject commit edd1ac0a8a66f3aab4a348d0a9b34e290b536fcf diff --git a/qusal/fedora-minimal/clone.sls b/qusal/fedora-minimal/clone.sls index 8a9c05e..7fc8751 100644 --- a/qusal/fedora-minimal/clone.sls +++ b/qusal/fedora-minimal/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/clone.top b/qusal/fedora-minimal/clone.top index 0c93359..b19b206 100644 --- a/qusal/fedora-minimal/clone.top +++ b/qusal/fedora-minimal/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/create.sls b/qusal/fedora-minimal/create.sls index e669266..fc2d073 100644 --- a/qusal/fedora-minimal/create.sls +++ b/qusal/fedora-minimal/create.sls @@ -1,20 +1,22 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} -{%- import slsdotpath ~ "/template.jinja" as fedora -%} +{%- from "qvm/template.jinja" import load -%} + +{%- import slsdotpath ~ "/template.jinja" as template -%} include: - .clone -"dvm-{{ fedora.fedora_minimal_template }}-absent": +"dvm-{{ template.template }}-absent": qvm.absent: - names: - - dvm-fedora-minimal - - fedora-minimal-dvm - - {{ fedora.fedora_minimal_template }}-dvm + - dvm-{{ template.template_clean }} + - {{ template.template_clean }}-dvm + - {{ template.template }}-dvm {% load_yaml as defaults -%} name: dvm-{{ template.template_clean }} @@ -22,10 +24,10 @@ force: True require: - sls: {{ template.template_clean }}.clone present: -- template: {{ fedora.fedora_minimal_template }} +- template: {{ template.template }} - label: red prefs: -- template: {{ fedora.fedora_minimal_template }} +- template: {{ template.template }} - label: red - memory: 300 - maxmem: 400 diff --git a/qusal/fedora-minimal/create.top b/qusal/fedora-minimal/create.top index 5b0ec18..74093a2 100644 --- a/qusal/fedora-minimal/create.top +++ b/qusal/fedora-minimal/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/init.top b/qusal/fedora-minimal/init.top index ed1d6fb..8baa87b 100644 --- a/qusal/fedora-minimal/init.top +++ b/qusal/fedora-minimal/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/install.sls b/qusal/fedora-minimal/install.sls index 7fc106e..e3aef44 100644 --- a/qusal/fedora-minimal/install.sls +++ b/qusal/fedora-minimal/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/install.top b/qusal/fedora-minimal/install.top index 7e7c112..8cb1f36 100644 --- a/qusal/fedora-minimal/install.top +++ b/qusal/fedora-minimal/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora-minimal/template.jinja b/qusal/fedora-minimal/template.jinja index 550a7f4..7b09578 100644 --- a/qusal/fedora-minimal/template.jinja +++ b/qusal/fedora-minimal/template.jinja @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/README.md b/qusal/fedora/README.md index bb002bb..8dddb14 100644 --- a/qusal/fedora/README.md +++ b/qusal/fedora/README.md @@ -22,6 +22,3 @@ qubesctl top.disable fedora qubesctl state.apply fedora.create qubesctl --skip-dom0 --targets=fedora-38 state.apply fedora.install ``` - - -SPD-License-Identifier: GPL-3.0-or-later diff --git a/qusal/fedora/clone.sls b/qusal/fedora/clone.sls index 8a9c05e..7fc8751 100644 --- a/qusal/fedora/clone.sls +++ b/qusal/fedora/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/clone.top b/qusal/fedora/clone.top index 4da9fbd..1840823 100644 --- a/qusal/fedora/clone.top +++ b/qusal/fedora/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/create.sls b/qusal/fedora/create.sls index 853184f..fc2d073 100644 --- a/qusal/fedora/create.sls +++ b/qusal/fedora/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + {%- import slsdotpath ~ "/template.jinja" as template -%} include: @@ -12,8 +14,8 @@ include: "dvm-{{ template.template }}-absent": qvm.absent: - names: - - dvm-fedora - - fedora-dvm + - dvm-{{ template.template_clean }} + - {{ template.template_clean }}-dvm - {{ template.template }}-dvm {% load_yaml as defaults -%} @@ -22,10 +24,10 @@ force: True require: - sls: {{ template.template_clean }}.clone present: -- template: {{ fedora.fedora_template }} +- template: {{ template.template }} - label: red prefs: -- template: {{ fedora.fedora_template }} +- template: {{ template.template }} - label: red - memory: 300 - maxmem: 400 diff --git a/qusal/fedora/create.top b/qusal/fedora/create.top index b39ac1d..d06e3a6 100644 --- a/qusal/fedora/create.top +++ b/qusal/fedora/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/init.top b/qusal/fedora/init.top index 63d3f16..a435062 100644 --- a/qusal/fedora/init.top +++ b/qusal/fedora/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/install.sls b/qusal/fedora/install.sls index c23907c..7809d24 100644 --- a/qusal/fedora/install.sls +++ b/qusal/fedora/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/install.top b/qusal/fedora/install.top index 2b35aae..381023f 100644 --- a/qusal/fedora/install.top +++ b/qusal/fedora/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/fedora/template.jinja b/qusal/fedora/template.jinja index 35eddfa..f487475 100644 --- a/qusal/fedora/template.jinja +++ b/qusal/fedora/template.jinja @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/clone.sls b/qusal/media/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/media/clone.sls +++ b/qusal/media/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/clone.top b/qusal/media/clone.top index e103bda..9f5fbb8 100644 --- a/qusal/media/clone.top +++ b/qusal/media/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/configure.sls b/qusal/media/configure.sls index d16e087..d4f5d3a 100644 --- a/qusal/media/configure.sls +++ b/qusal/media/configure.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/configure.top b/qusal/media/configure.top index 84bc2be..4b78e8d 100644 --- a/qusal/media/configure.top +++ b/qusal/media/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/create.sls b/qusal/media/create.sls index 5c48a5c..c9cb850 100644 --- a/qusal/media/create.sls +++ b/qusal/media/create.sls @@ -1,10 +1,12 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + {%- import "templates/debian-minimal.jinja" as template -%} include: diff --git a/qusal/media/create.top b/qusal/media/create.top index 8e1cc83..2f7c533 100644 --- a/qusal/media/create.top +++ b/qusal/media/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/files/policy/default.policy b/qusal/media/files/policy/default.policy index e12b6d9..4f255fd 100644 --- a/qusal/media/files/policy/default.policy +++ b/qusal/media/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/media/init.top b/qusal/media/init.top index 1f315d8..6677e10 100644 --- a/qusal/media/init.top +++ b/qusal/media/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/install.sls b/qusal/media/install.sls index 0b4f9f7..277c718 100644 --- a/qusal/media/install.sls +++ b/qusal/media/install.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/media/install.top b/qusal/media/install.top index 867af69..edf5d67 100644 --- a/qusal/media/install.top +++ b/qusal/media/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/README.md b/qusal/mgmt/README.md index 1da03eb..2618f07 100644 --- a/qusal/mgmt/README.md +++ b/qusal/mgmt/README.md @@ -19,7 +19,5 @@ of a qube or for Salt Management on DomUs. ```sh qubesctl state.apply mgmt.create qubesctl --skip-dom0 --targets=tpl-mgmt state.apply mgmt.install -qubesctl state.apply mgmt.confirm +qubesctl state.apply mgmt.prefs ``` - -SPD-License-Identifier: GPL-3.0-or-later diff --git a/qusal/mgmt/clone.sls b/qusal/mgmt/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/mgmt/clone.sls +++ b/qusal/mgmt/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/clone.top b/qusal/mgmt/clone.top index c2335ab..dbcbd2d 100644 --- a/qusal/mgmt/clone.top +++ b/qusal/mgmt/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/confirm.top b/qusal/mgmt/confirm.top deleted file mode 100644 index f07e5a1..0000000 --- a/qusal/mgmt/confirm.top +++ /dev/null @@ -1,10 +0,0 @@ -{# -SPDX-FileCopyrightText: 2023 Qusal contributors - -SPDX-License-Identifier: GPL-3.0-or-later -#} - -base: - 'dom0': - - match: nodegroup - - mgmt.confirm diff --git a/qusal/mgmt/create.sls b/qusal/mgmt/create.sls index 874b61c..42c1e0c 100644 --- a/qusal/mgmt/create.sls +++ b/qusal/mgmt/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/mgmt/create.top b/qusal/mgmt/create.top index 00a9fac..994d922 100644 --- a/qusal/mgmt/create.top +++ b/qusal/mgmt/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/init.top b/qusal/mgmt/init.top index a5866ad..e0a477d 100644 --- a/qusal/mgmt/init.top +++ b/qusal/mgmt/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/install.sls b/qusal/mgmt/install.sls index 10aa858..261acd4 100644 --- a/qusal/mgmt/install.sls +++ b/qusal/mgmt/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/install.top b/qusal/mgmt/install.top index b0637f8..8bd1e66 100644 --- a/qusal/mgmt/install.top +++ b/qusal/mgmt/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mgmt/confirm.sls b/qusal/mgmt/prefs.sls similarity index 76% rename from qusal/mgmt/confirm.sls rename to qusal/mgmt/prefs.sls index 59378ea..ad51319 100644 --- a/qusal/mgmt/confirm.sls +++ b/qusal/mgmt/prefs.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} @@ -7,8 +7,6 @@ SPDX-License-Identifier: GPL-3.0-or-later "{{ slsdotpath }}-set-management_dispvm": cmd.run: - name: qubes-prefs management_dispvm dvm-{{ slsdotpath }} - - require: - - sls: {{ slsdotpath }}.install "{{ slsdotpath }}-remove-default-mgmt-dvm": qvm.absent: diff --git a/qusal/mgmt/prefs.top b/qusal/mgmt/prefs.top new file mode 100644 index 0000000..709eab8 --- /dev/null +++ b/qusal/mgmt/prefs.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - mgmt.prefs diff --git a/qusal/mutt/clone.sls b/qusal/mutt/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/mutt/clone.sls +++ b/qusal/mutt/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/clone.top b/qusal/mutt/clone.top index d3caefb..0dbf782 100644 --- a/qusal/mutt/clone.top +++ b/qusal/mutt/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/configure.sls b/qusal/mutt/configure.sls index 59c2367..00a85e1 100644 --- a/qusal/mutt/configure.sls +++ b/qusal/mutt/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/configure.top b/qusal/mutt/configure.top index 708bfa6..084ec75 100644 --- a/qusal/mutt/configure.top +++ b/qusal/mutt/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/create.sls b/qusal/mutt/create.sls index c10c929..9eb5c39 100644 --- a/qusal/mutt/create.sls +++ b/qusal/mutt/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/mutt/create.top b/qusal/mutt/create.top index f8f0340..2a3c724 100644 --- a/qusal/mutt/create.top +++ b/qusal/mutt/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/init.top b/qusal/mutt/init.top index be946ea..ecf8593 100644 --- a/qusal/mutt/init.top +++ b/qusal/mutt/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/install.sls b/qusal/mutt/install.sls index dab5a5c..77b7e23 100644 --- a/qusal/mutt/install.sls +++ b/qusal/mutt/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/mutt/install.top b/qusal/mutt/install.top index 676912d..8127d2c 100644 --- a/qusal/mutt/install.top +++ b/qusal/mutt/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/clone.sls b/qusal/qubes-builder/clone.sls index 8a4ed04..0c030b5 100644 --- a/qusal/qubes-builder/clone.sls +++ b/qusal/qubes-builder/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/clone.top b/qusal/qubes-builder/clone.top index e61b16d..c45b68d 100644 --- a/qusal/qubes-builder/clone.top +++ b/qusal/qubes-builder/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/configure-qubes-executor.sls b/qusal/qubes-builder/configure-qubes-executor.sls index c9ac84c..d3b9d56 100644 --- a/qusal/qubes-builder/configure-qubes-executor.sls +++ b/qusal/qubes-builder/configure-qubes-executor.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/configure-qubes-executor.top b/qusal/qubes-builder/configure-qubes-executor.top index 0c10c7d..60b0aef 100644 --- a/qusal/qubes-builder/configure-qubes-executor.top +++ b/qusal/qubes-builder/configure-qubes-executor.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/configure.sls b/qusal/qubes-builder/configure.sls index 701e86c..3af8830 100644 --- a/qusal/qubes-builder/configure.sls +++ b/qusal/qubes-builder/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/configure.top b/qusal/qubes-builder/configure.top index 7ebf8e0..3301674 100644 --- a/qusal/qubes-builder/configure.top +++ b/qusal/qubes-builder/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/create.sls b/qusal/qubes-builder/create.sls index f858c0c..219fa42 100644 --- a/qusal/qubes-builder/create.sls +++ b/qusal/qubes-builder/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/qubes-builder/create.top b/qusal/qubes-builder/create.top index 1d3e95f..d1ac22e 100644 --- a/qusal/qubes-builder/create.top +++ b/qusal/qubes-builder/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/files/policy/default.policy b/qusal/qubes-builder/files/policy/default.policy index 775265c..e28f231 100644 --- a/qusal/qubes-builder/files/policy/default.policy +++ b/qusal/qubes-builder/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/qubes-builder/init.sls b/qusal/qubes-builder/init.sls index 4d34bd9..68bc25d 100644 --- a/qusal/qubes-builder/init.sls +++ b/qusal/qubes-builder/init.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/init.top b/qusal/qubes-builder/init.top index f1ea665..3b99752 100644 --- a/qusal/qubes-builder/init.top +++ b/qusal/qubes-builder/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/install-qubes-executor.sls b/qusal/qubes-builder/install-qubes-executor.sls index c9f0223..84337fe 100644 --- a/qusal/qubes-builder/install-qubes-executor.sls +++ b/qusal/qubes-builder/install-qubes-executor.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/install-qubes-executor.top b/qusal/qubes-builder/install-qubes-executor.top index bd18804..2ec8f7a 100644 --- a/qusal/qubes-builder/install-qubes-executor.top +++ b/qusal/qubes-builder/install-qubes-executor.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/install.sls b/qusal/qubes-builder/install.sls index 528263b..fcb6ad2 100644 --- a/qusal/qubes-builder/install.sls +++ b/qusal/qubes-builder/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/qubes-builder/install.top b/qusal/qubes-builder/install.top index cc8d413..56cf921 100644 --- a/qusal/qubes-builder/install.top +++ b/qusal/qubes-builder/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/clone.sls b/qusal/reader/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/reader/clone.sls +++ b/qusal/reader/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/clone.top b/qusal/reader/clone.top index 4bfad83..dd0cff9 100644 --- a/qusal/reader/clone.top +++ b/qusal/reader/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/create.sls b/qusal/reader/create.sls index 26790ba..91b3332 100644 --- a/qusal/reader/create.sls +++ b/qusal/reader/create.sls @@ -1,10 +1,12 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/reader/create.top b/qusal/reader/create.top index af6a156..2ea5426 100644 --- a/qusal/reader/create.top +++ b/qusal/reader/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/init.top b/qusal/reader/init.top index f4b161b..e7ce9bc 100644 --- a/qusal/reader/init.top +++ b/qusal/reader/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/install.sls b/qusal/reader/install.sls index 7e158b4..8daad48 100644 --- a/qusal/reader/install.sls +++ b/qusal/reader/install.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/reader/install.top b/qusal/reader/install.top index 986d890..2241183 100644 --- a/qusal/reader/install.top +++ b/qusal/reader/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/appmenus.sls b/qusal/remmina/appmenus.sls index 42bafd0..7b3e9c0 100644 --- a/qusal/remmina/appmenus.sls +++ b/qusal/remmina/appmenus.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/appmenus.top b/qusal/remmina/appmenus.top index 9b381aa..20aa997 100644 --- a/qusal/remmina/appmenus.top +++ b/qusal/remmina/appmenus.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/clone.sls b/qusal/remmina/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/remmina/clone.sls +++ b/qusal/remmina/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/clone.top b/qusal/remmina/clone.top index 72df4d3..15a20cc 100644 --- a/qusal/remmina/clone.top +++ b/qusal/remmina/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/create.sls b/qusal/remmina/create.sls index 2057c9c..d61815c 100644 --- a/qusal/remmina/create.sls +++ b/qusal/remmina/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/remmina/create.top b/qusal/remmina/create.top index 850be21..123a8f8 100644 --- a/qusal/remmina/create.top +++ b/qusal/remmina/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/init.top b/qusal/remmina/init.top index 03833a2..fbf032f 100644 --- a/qusal/remmina/init.top +++ b/qusal/remmina/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/install.sls b/qusal/remmina/install.sls index d9aa565..70377b7 100644 --- a/qusal/remmina/install.sls +++ b/qusal/remmina/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/remmina/install.top b/qusal/remmina/install.top index 0301959..c7de722 100644 --- a/qusal/remmina/install.top +++ b/qusal/remmina/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/clone.sls b/qusal/signal/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/signal/clone.sls +++ b/qusal/signal/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/clone.top b/qusal/signal/clone.top index 2401478..1357dd8 100644 --- a/qusal/signal/clone.top +++ b/qusal/signal/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/configure.sls b/qusal/signal/configure.sls index 6909045..2a3aba8 100644 --- a/qusal/signal/configure.sls +++ b/qusal/signal/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/configure.top b/qusal/signal/configure.top index ac1ee77..54306e6 100644 --- a/qusal/signal/configure.top +++ b/qusal/signal/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/create.sls b/qusal/signal/create.sls index f0f66db..be26d3a 100644 --- a/qusal/signal/create.sls +++ b/qusal/signal/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone - .firewall diff --git a/qusal/signal/create.top b/qusal/signal/create.top index 01bc002..9ad0cdc 100644 --- a/qusal/signal/create.top +++ b/qusal/signal/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/firewall.sls b/qusal/signal/firewall.sls index 362f715..b5be516 100644 --- a/qusal/signal/firewall.sls +++ b/qusal/signal/firewall.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/firewall.top b/qusal/signal/firewall.top index e30e925..dfad3fc 100644 --- a/qusal/signal/firewall.top +++ b/qusal/signal/firewall.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/init.top b/qusal/signal/init.top index 1d46369..2864189 100644 --- a/qusal/signal/init.top +++ b/qusal/signal/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/install.sls b/qusal/signal/install.sls index d39c5cc..fddab69 100644 --- a/qusal/signal/install.sls +++ b/qusal/signal/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/signal/install.top b/qusal/signal/install.top index 9db5679..d7cb679 100644 --- a/qusal/signal/install.top +++ b/qusal/signal/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/clone.sls b/qusal/ssh/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/ssh/clone.sls +++ b/qusal/ssh/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/clone.top b/qusal/ssh/clone.top index 11b0932..cbccd7d 100644 --- a/qusal/ssh/clone.top +++ b/qusal/ssh/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/configure.sls b/qusal/ssh/configure.sls index ec58e31..02f57a9 100644 --- a/qusal/ssh/configure.sls +++ b/qusal/ssh/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/configure.top b/qusal/ssh/configure.top index 3ce2689..3624e42 100644 --- a/qusal/ssh/configure.top +++ b/qusal/ssh/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/create.sls b/qusal/ssh/create.sls index e4a032b..f7bc08e 100644 --- a/qusal/ssh/create.sls +++ b/qusal/ssh/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/ssh/create.top b/qusal/ssh/create.top index 26a5d39..a720418 100644 --- a/qusal/ssh/create.top +++ b/qusal/ssh/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/init.top b/qusal/ssh/init.top index 04360a8..99ca6ac 100644 --- a/qusal/ssh/init.top +++ b/qusal/ssh/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/install.sls b/qusal/ssh/install.sls index 499c11b..5f71d6b 100644 --- a/qusal/ssh/install.sls +++ b/qusal/ssh/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/ssh/install.top b/qusal/ssh/install.top index 6e082cf..daace22 100644 --- a/qusal/ssh/install.top +++ b/qusal/ssh/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/clone.sls b/qusal/sys-cacher/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-cacher/clone.sls +++ b/qusal/sys-cacher/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/clone.top b/qusal/sys-cacher/clone.top index 5c27def..ee2dd25 100644 --- a/qusal/sys-cacher/clone.top +++ b/qusal/sys-cacher/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/configure.sls b/qusal/sys-cacher/configure.sls index c29356c..f8e3980 100644 --- a/qusal/sys-cacher/configure.sls +++ b/qusal/sys-cacher/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/configure.top b/qusal/sys-cacher/configure.top index 32e54ab..dfda2a2 100644 --- a/qusal/sys-cacher/configure.top +++ b/qusal/sys-cacher/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/create.sls b/qusal/sys-cacher/create.sls index df53a2e..ba240d1 100644 --- a/qusal/sys-cacher/create.sls +++ b/qusal/sys-cacher/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/sys-cacher/create.top b/qusal/sys-cacher/create.top index 9b0d57f..1028797 100644 --- a/qusal/sys-cacher/create.top +++ b/qusal/sys-cacher/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/deinit.top b/qusal/sys-cacher/deinit.top index a0f4a6c..af7981f 100644 --- a/qusal/sys-cacher/deinit.top +++ b/qusal/sys-cacher/deinit.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/files/conf/acng.conf b/qusal/sys-cacher/files/conf/acng.conf index 27c985e..b2cebd0 100644 --- a/qusal/sys-cacher/files/conf/acng.conf +++ b/qusal/sys-cacher/files/conf/acng.conf @@ -1,5 +1,5 @@ # SPDX-FileCopyrightText: 2022 unman -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-cacher/files/policy/default.policy b/qusal/sys-cacher/files/policy/default.policy index 0ae56c3..922886d 100644 --- a/qusal/sys-cacher/files/policy/default.policy +++ b/qusal/sys-cacher/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-cacher/init.top b/qusal/sys-cacher/init.top index cf99605..2755445 100644 --- a/qusal/sys-cacher/init.top +++ b/qusal/sys-cacher/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/install-client.sls b/qusal/sys-cacher/install-client.sls index 81d7821..ae856ac 100644 --- a/qusal/sys-cacher/install-client.sls +++ b/qusal/sys-cacher/install-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/install-client.top b/qusal/sys-cacher/install-client.top index 6113908..95037ed 100644 --- a/qusal/sys-cacher/install-client.top +++ b/qusal/sys-cacher/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/install.sls b/qusal/sys-cacher/install.sls index 0af3634..7d5a77a 100644 --- a/qusal/sys-cacher/install.sls +++ b/qusal/sys-cacher/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/install.top b/qusal/sys-cacher/install.top index 2de402b..ee05af0 100644 --- a/qusal/sys-cacher/install.top +++ b/qusal/sys-cacher/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/remove-policy.sls b/qusal/sys-cacher/remove-policy.sls index a066c2c..7e6350d 100644 --- a/qusal/sys-cacher/remove-policy.sls +++ b/qusal/sys-cacher/remove-policy.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/tag.sls b/qusal/sys-cacher/tag.sls index ca7a280..6d7f58b 100644 --- a/qusal/sys-cacher/tag.sls +++ b/qusal/sys-cacher/tag.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/tag.top b/qusal/sys-cacher/tag.top index bd98f5c..bf9b98f 100644 --- a/qusal/sys-cacher/tag.top +++ b/qusal/sys-cacher/tag.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/uninstall-client.sls b/qusal/sys-cacher/uninstall-client.sls index c7210b5..576c198 100644 --- a/qusal/sys-cacher/uninstall-client.sls +++ b/qusal/sys-cacher/uninstall-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/uninstall-client.top b/qusal/sys-cacher/uninstall-client.top index 0f9c350..105ac9a 100644 --- a/qusal/sys-cacher/uninstall-client.top +++ b/qusal/sys-cacher/uninstall-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/untag.sls b/qusal/sys-cacher/untag.sls index 5047fd1..ce09b31 100644 --- a/qusal/sys-cacher/untag.sls +++ b/qusal/sys-cacher/untag.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-cacher/untag.top b/qusal/sys-cacher/untag.top index 7c77521..627bc0d 100644 --- a/qusal/sys-cacher/untag.top +++ b/qusal/sys-cacher/untag.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/clone.sls b/qusal/sys-firewall/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-firewall/clone.sls +++ b/qusal/sys-firewall/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/clone.top b/qusal/sys-firewall/clone.top index 14a329c..2eea597 100644 --- a/qusal/sys-firewall/clone.top +++ b/qusal/sys-firewall/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/create.sls b/qusal/sys-firewall/create.sls index 2f54fda..42adea5 100644 --- a/qusal/sys-firewall/create.sls +++ b/qusal/sys-firewall/create.sls @@ -1,11 +1,10 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} -include: - - .clone +{%- from "qvm/template.jinja" import load -%} # Use the netvm of the default_netvm. {% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%} @@ -15,6 +14,9 @@ include: {% set netvm = default_netvm %} {% endif -%} +include: + - .clone + {% load_yaml as defaults -%} name: {{ slsdotpath }} force: True @@ -35,6 +37,7 @@ prefs: features: - enable: - servicevm + - service.qubes-firewall - disable: - service.cups - service.cups-browsed @@ -90,6 +93,7 @@ prefs: features: - enable: - servicevm + - service.qubes-firewall - disable: - service.cups - service.cups-browsed diff --git a/qusal/sys-firewall/create.top b/qusal/sys-firewall/create.top index 79b7158..a5c57f4 100644 --- a/qusal/sys-firewall/create.top +++ b/qusal/sys-firewall/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/init.top b/qusal/sys-firewall/init.top index 90f2ac0..0536d88 100644 --- a/qusal/sys-firewall/init.top +++ b/qusal/sys-firewall/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/install.sls b/qusal/sys-firewall/install.sls index 2bf0df5..c74b00d 100644 --- a/qusal/sys-firewall/install.sls +++ b/qusal/sys-firewall/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/install.top b/qusal/sys-firewall/install.top index 1369246..013df68 100644 --- a/qusal/sys-firewall/install.top +++ b/qusal/sys-firewall/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/prefs-disp.sls b/qusal/sys-firewall/prefs-disp.sls index 47522b9..e007848 100644 --- a/qusal/sys-firewall/prefs-disp.sls +++ b/qusal/sys-firewall/prefs-disp.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/prefs-disp.top b/qusal/sys-firewall/prefs-disp.top index f701c38..f8c83f6 100644 --- a/qusal/sys-firewall/prefs-disp.top +++ b/qusal/sys-firewall/prefs-disp.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/prefs.sls b/qusal/sys-firewall/prefs.sls index 964ec50..3126e7c 100644 --- a/qusal/sys-firewall/prefs.sls +++ b/qusal/sys-firewall/prefs.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-firewall/prefs.top b/qusal/sys-firewall/prefs.top index 6c0eb48..da5c73d 100644 --- a/qusal/sys-firewall/prefs.top +++ b/qusal/sys-firewall/prefs.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/clone.sls b/qusal/sys-git/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-git/clone.sls +++ b/qusal/sys-git/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/clone.top b/qusal/sys-git/clone.top index f4dd3df..f5ae4e9 100644 --- a/qusal/sys-git/clone.top +++ b/qusal/sys-git/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/configure.sls b/qusal/sys-git/configure.sls index 97cdb81..62733f2 100644 --- a/qusal/sys-git/configure.sls +++ b/qusal/sys-git/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/configure.top b/qusal/sys-git/configure.top index 4c0a46d..44f0aa9 100644 --- a/qusal/sys-git/configure.top +++ b/qusal/sys-git/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/create.sls b/qusal/sys-git/create.sls index d31f67c..8180b33 100644 --- a/qusal/sys-git/create.sls +++ b/qusal/sys-git/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/sys-git/create.top b/qusal/sys-git/create.top index efbd8d9..4bebd54 100644 --- a/qusal/sys-git/create.top +++ b/qusal/sys-git/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/files/client/git-core/git-init-qrexec b/qusal/sys-git/files/client/git-core/git-init-qrexec index a95a261..b8ec218 100755 --- a/qusal/sys-git/files/client/git-core/git-init-qrexec +++ b/qusal/sys-git/files/client/git-core/git-init-qrexec @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-git/files/client/git-core/git-remote-qrexec b/qusal/sys-git/files/client/git-core/git-remote-qrexec index 8563219..4c022d5 100755 --- a/qusal/sys-git/files/client/git-core/git-remote-qrexec +++ b/qusal/sys-git/files/client/git-core/git-remote-qrexec @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect b/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect index 2afb569..e888fcb 100755 --- a/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect +++ b/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-git/files/policy/default.policy b/qusal/sys-git/files/policy/default.policy index 99ffba5..39cda05 100644 --- a/qusal/sys-git/files/policy/default.policy +++ b/qusal/sys-git/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-git/files/rpc/qusal.GitInit b/qusal/sys-git/files/rpc/qusal.GitInit index b8c7115..69fa549 100644 --- a/qusal/sys-git/files/rpc/qusal.GitInit +++ b/qusal/sys-git/files/rpc/qusal.GitInit @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-git/init.top b/qusal/sys-git/init.top index 482143e..c67fedf 100644 --- a/qusal/sys-git/init.top +++ b/qusal/sys-git/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/install-client.sls b/qusal/sys-git/install-client.sls index ead1072..4153a0e 100644 --- a/qusal/sys-git/install-client.sls +++ b/qusal/sys-git/install-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/install-client.top b/qusal/sys-git/install-client.top index e1d46de..1b9596f 100644 --- a/qusal/sys-git/install-client.top +++ b/qusal/sys-git/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/install.sls b/qusal/sys-git/install.sls index 6871799..326e634 100644 --- a/qusal/sys-git/install.sls +++ b/qusal/sys-git/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-git/install.top b/qusal/sys-git/install.top index 9124f37..4110c15 100644 --- a/qusal/sys-git/install.top +++ b/qusal/sys-git/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/clone.sls b/qusal/sys-net/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-net/clone.sls +++ b/qusal/sys-net/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/clone.top b/qusal/sys-net/clone.top index 48a2663..04d9be5 100644 --- a/qusal/sys-net/clone.top +++ b/qusal/sys-net/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/create.sls b/qusal/sys-net/create.sls index b11dcff..5b73eed 100644 --- a/qusal/sys-net/create.sls +++ b/qusal/sys-net/create.sls @@ -1,14 +1,16 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} -include: - - .clone +{%- from "qvm/template.jinja" import load -%} {% set net_pcidevs = salt['grains.get']('pci_net_devs', []) -%} +include: + - .clone + {% load_yaml as defaults -%} name: {{ slsdotpath }} force: True diff --git a/qusal/sys-net/create.top b/qusal/sys-net/create.top index 31cdda4..367c3e1 100644 --- a/qusal/sys-net/create.top +++ b/qusal/sys-net/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/files/policy/default.policy b/qusal/sys-net/files/policy/default.policy index 0fc2599..6a273b5 100644 --- a/qusal/sys-net/files/policy/default.policy +++ b/qusal/sys-net/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-net/init.top b/qusal/sys-net/init.top index 9cdfabd..03031ed 100644 --- a/qusal/sys-net/init.top +++ b/qusal/sys-net/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/install-debug.sls b/qusal/sys-net/install-debug.sls index 39da524..ae4498c 100644 --- a/qusal/sys-net/install-debug.sls +++ b/qusal/sys-net/install-debug.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/install-debug.top b/qusal/sys-net/install-debug.top index 722f2e2..bc9d000 100644 --- a/qusal/sys-net/install-debug.top +++ b/qusal/sys-net/install-debug.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/install.sls b/qusal/sys-net/install.sls index 4e1c6cd..10e82eb 100644 --- a/qusal/sys-net/install.sls +++ b/qusal/sys-net/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/install.top b/qusal/sys-net/install.top index da6e0e1..8bd2f11 100644 --- a/qusal/sys-net/install.top +++ b/qusal/sys-net/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/prefs-disp.sls b/qusal/sys-net/prefs-disp.sls index 9abbd98..5bf274b 100644 --- a/qusal/sys-net/prefs-disp.sls +++ b/qusal/sys-net/prefs-disp.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/prefs-disp.top b/qusal/sys-net/prefs-disp.top index 1202485..fe24431 100644 --- a/qusal/sys-net/prefs-disp.top +++ b/qusal/sys-net/prefs-disp.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-net/prefs.sls b/qusal/sys-net/prefs.sls index 40e7bbc..1138056 100644 --- a/qusal/sys-net/prefs.sls +++ b/qusal/sys-net/prefs.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} @@ -23,4 +23,4 @@ include: - name: qubes-prefs clockvm {{ slsdotpath }} {% from 'utils/macros/policy.sls' import policy_set with context -%} -{{ policy_unset(sls_path, '80') }} +{{ policy_set(sls_path, '80') }} diff --git a/qusal/sys-net/prefs.top b/qusal/sys-net/prefs.top index 28d3883..8721fe9 100644 --- a/qusal/sys-net/prefs.top +++ b/qusal/sys-net/prefs.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/clone.sls b/qusal/sys-pgp/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-pgp/clone.sls +++ b/qusal/sys-pgp/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/clone.top b/qusal/sys-pgp/clone.top index 2808ae7..258540f 100644 --- a/qusal/sys-pgp/clone.top +++ b/qusal/sys-pgp/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/configure.sls b/qusal/sys-pgp/configure.sls index 0ea815e..141a051 100644 --- a/qusal/sys-pgp/configure.sls +++ b/qusal/sys-pgp/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/configure.top b/qusal/sys-pgp/configure.top index 0f51f13..1f80e63 100644 --- a/qusal/sys-pgp/configure.top +++ b/qusal/sys-pgp/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/create.sls b/qusal/sys-pgp/create.sls index c8232ba..bed31b8 100644 --- a/qusal/sys-pgp/create.sls +++ b/qusal/sys-pgp/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/sys-pgp/create.top b/qusal/sys-pgp/create.top index 14b7878..45d221b 100644 --- a/qusal/sys-pgp/create.top +++ b/qusal/sys-pgp/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/files/policy/default.policy b/qusal/sys-pgp/files/policy/default.policy index 3a13716..5ed845b 100644 --- a/qusal/sys-pgp/files/policy/default.policy +++ b/qusal/sys-pgp/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-pgp/init.top b/qusal/sys-pgp/init.top index b92745c..233a456 100644 --- a/qusal/sys-pgp/init.top +++ b/qusal/sys-pgp/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/install-client.sls b/qusal/sys-pgp/install-client.sls index 3b1f88e..c3197d1 100644 --- a/qusal/sys-pgp/install-client.sls +++ b/qusal/sys-pgp/install-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/install-client.top b/qusal/sys-pgp/install-client.top index 1587227..513984d 100644 --- a/qusal/sys-pgp/install-client.top +++ b/qusal/sys-pgp/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/install.sls b/qusal/sys-pgp/install.sls index 6e07828..a3618fc 100644 --- a/qusal/sys-pgp/install.sls +++ b/qusal/sys-pgp/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pgp/install.top b/qusal/sys-pgp/install.top index c046999..5efa26c 100644 --- a/qusal/sys-pgp/install.top +++ b/qusal/sys-pgp/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pihole/README.md b/qusal/sys-pihole/README.md index 59f0533..fc751d5 100644 --- a/qusal/sys-pihole/README.md +++ b/qusal/sys-pihole/README.md @@ -35,7 +35,7 @@ qubesctl state.apply browser.appmenus qubesctl state.apply sys-pihole.create qubesctl --skip-dom0 --targets=tpl-browser state.apply browser.install qubesctl --skip-dom0 --targets=sys-pihole state.apply sys-pihole.install -qubesctl --skip-dom0 --targets=dvm-browser-sys-pihole state.apply sys-pihole.install +qubesctl --skip-dom0 --targets=dvm-browser-sys-pihole state.apply sys-pihole.configure-dvm qubesctl state.apply browser.appmenus ``` @@ -48,11 +48,6 @@ qubesctl state.apply sys-pihole.prefs ## Usage -Two qubes will be created for usage. You should run the `pihole` program in -`sys-pihole`. If you want to view statistics or manage Pi-Hole through the -browser, open the browser in `disp-browser-sys-pihole`. The URL will be given -below. - Pi-hole will be installed with these default settings: - The DNS provider is Quad9 (filtered, DNSSEC) @@ -68,6 +63,13 @@ You should change this password on first use by running in `sys-pihole`: pihole -a -p ``` +If you want to view statistics or manage Pi-Hole through the browser, open the +browser in `disp-browser-sys-pihole`. This disposable qube has no netvm and +has connection to the Pi-Hole server. The browser separation is to prevent the +use of a browser in the same machine the server is running, which you could +mistakenly browse the internet in the proxy qube if the separation was not +done. + You can clone `sys-pihole`. If you do, you must manually change the IP address of the clone. diff --git a/qusal/sys-pihole/clone.sls b/qusal/sys-pihole/clone.sls deleted file mode 100644 index 9391fbc..0000000 --- a/qusal/sys-pihole/clone.sls +++ /dev/null @@ -1,8 +0,0 @@ -{# -SPDX-FileCopyrightText: 2023 Qusal contributors - -SPDX-License-Identifier: GPL-3.0-or-later -#} - -{% from 'utils/macros/clone-template.sls' import clone_template -%} -{{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-pihole/clone.top b/qusal/sys-pihole/clone.top deleted file mode 100644 index b2af034..0000000 --- a/qusal/sys-pihole/clone.top +++ /dev/null @@ -1,10 +0,0 @@ -{# -SPDX-FileCopyrightText: 2023 Qusal contributors - -SPDX-License-Identifier: GPL-3.0-or-later -#} - -base: - 'dom0': - - match: nodegroup - - sys-pihole.clone diff --git a/qusal/sys-pihole/configure-dvm.sls b/qusal/sys-pihole/configure-dvm.sls index 531c09e..58f925f 100644 --- a/qusal/sys-pihole/configure-dvm.sls +++ b/qusal/sys-pihole/configure-dvm.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pihole/configure-dvm.top b/qusal/sys-pihole/configure-dvm.top index 402e29a..d06d45e 100644 --- a/qusal/sys-pihole/configure-dvm.top +++ b/qusal/sys-pihole/configure-dvm.top @@ -1,9 +1,9 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} base: - 'dvm-sys-pihole': + 'dvm-browser-sys-pihole': - sys-pihole.configure-dvm diff --git a/qusal/sys-pihole/create.sls b/qusal/sys-pihole/create.sls index de73e2f..3b8834e 100644 --- a/qusal/sys-pihole/create.sls +++ b/qusal/sys-pihole/create.sls @@ -1,30 +1,34 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} -{%- import "debian/template.jinja" as template -%} +{%- from "qvm/template.jinja" import load -%} -## Use the netvm of the default_netvm. +{%- import "debian-minimal/template.jinja" as template -%} + +{# Use the netvm of the default_netvm. #} {% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%} {% set netvm = salt['cmd.shell']('qvm-prefs ' + default_netvm + ' netvm') -%} -## If netvm of default_netvm is empty, user's default_netvm is the first in -## the chain (sys-net). +{# +If netvm of default_netvm is empty, user's default_netvm is the first in +the chain (sys-net). +#} {% if netvm == '' %} {% set netvm = default_netvm %} {% endif %} include: - - .clone + - debian-minimal.create - browser.create {% load_yaml as defaults -%} name: {{ slsdotpath }} force: True require: -- sls: {{ slsdotpath }}.clone +- sls: {{ template.template_clean }}.create present: - template: {{ template.template }} - label: orange @@ -40,6 +44,7 @@ features: - enable: - servicevm - service.updates-proxy-setup + - service.qubes-firewall - disable: - service.cups - service.cups-browsed @@ -109,4 +114,4 @@ features: - qvm: {{ slsdotpath }} {% from 'utils/macros/policy.sls' import policy_set with context -%} -{{ policy_unset(sls_path, '80') }} +{{ policy_set(sls_path, '80') }} diff --git a/qusal/sys-pihole/create.top b/qusal/sys-pihole/create.top index 3cb9f4e..759faa7 100644 --- a/qusal/sys-pihole/create.top +++ b/qusal/sys-pihole/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pihole/files/firewall/flush.sh b/qusal/sys-pihole/files/firewall/flush.sh index 229b6bb..8f1fdac 100644 --- a/qusal/sys-pihole/files/firewall/flush.sh +++ b/qusal/sys-pihole/files/firewall/flush.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2022 - 2023 unman -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-pihole/files/firewall/internalise.sh b/qusal/sys-pihole/files/firewall/internalise.sh index 9dbfb29..81573c2 100644 --- a/qusal/sys-pihole/files/firewall/internalise.sh +++ b/qusal/sys-pihole/files/firewall/internalise.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2022 - 2023 unman -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-pihole/files/firewall/update_nft.sh b/qusal/sys-pihole/files/firewall/update_nft.sh index bace2d7..804f3f3 100644 --- a/qusal/sys-pihole/files/firewall/update_nft.sh +++ b/qusal/sys-pihole/files/firewall/update_nft.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2022 - 2023 unman -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-pihole/files/policy/default.policy b/qusal/sys-pihole/files/policy/default.policy index fcc9e50..65dd0e1 100644 --- a/qusal/sys-pihole/files/policy/default.policy +++ b/qusal/sys-pihole/files/policy/default.policy @@ -1,9 +1,9 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. -qubes.ConnectTCP +80 disp-browser-{{ slsdotpath }} @default allow target={{ sls_path }} -qubes.ConnectTCP * disp-browser-{{ slsdotpath }} @anyvm deny +qubes.ConnectTCP +80 disp-browser-{{ sls_path }} @default allow target={{ sls_path }} +qubes.ConnectTCP * disp-browser-{{ sls_path }} @anyvm deny ## vim:ft=qrexecpolicy diff --git a/qusal/sys-pihole/files/prefs.sh b/qusal/sys-pihole/files/prefs.sh index 88dda61..de988ae 100755 --- a/qusal/sys-pihole/files/prefs.sh +++ b/qusal/sys-pihole/files/prefs.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-FileCopyrightText: 2022 - 2023 unman -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-pihole/init.top b/qusal/sys-pihole/init.top index 65c6e38..0b26151 100644 --- a/qusal/sys-pihole/init.top +++ b/qusal/sys-pihole/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} @@ -10,3 +10,5 @@ base: - sys-pihole.create 'sys-pihole': - sys-pihole.install + 'dvm-browser-sys-pihole': + - sys-pihole.configure-dvm diff --git a/qusal/sys-pihole/install.sls b/qusal/sys-pihole/install.sls index 68bde2e..5194191 100644 --- a/qusal/sys-pihole/install.sls +++ b/qusal/sys-pihole/install.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} @@ -77,6 +77,7 @@ include: - name: https://github.com/pi-hole/pi-hole.git - user: root - target: /root/pi-hole + - force_fetch: True "{{ slsdotpath }}-setupVars.conf": file.managed: @@ -88,7 +89,7 @@ include: "{{ slsdotpath }}-setup": cmd.run: - - name: ./basic-install.sh --unattended' + - name: ./basic-install.sh --unattended - cwd: '/root/pi-hole/automated install' - runas: root diff --git a/qusal/sys-pihole/install.top b/qusal/sys-pihole/install.top index f21ad08..1ca738f 100644 --- a/qusal/sys-pihole/install.top +++ b/qusal/sys-pihole/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pihole/prefs.sls b/qusal/sys-pihole/prefs.sls index 6237611..04cc424 100644 --- a/qusal/sys-pihole/prefs.sls +++ b/qusal/sys-pihole/prefs.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-pihole/prefs.top b/qusal/sys-pihole/prefs.top index 2801b4c..c6fdcbf 100644 --- a/qusal/sys-pihole/prefs.top +++ b/qusal/sys-pihole/prefs.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/clone.sls b/qusal/sys-ssh-agent/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-ssh-agent/clone.sls +++ b/qusal/sys-ssh-agent/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/clone.top b/qusal/sys-ssh-agent/clone.top index 3f0e40c..887da6c 100644 --- a/qusal/sys-ssh-agent/clone.top +++ b/qusal/sys-ssh-agent/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/configure.sls b/qusal/sys-ssh-agent/configure.sls index 505170b..194cd47 100644 --- a/qusal/sys-ssh-agent/configure.sls +++ b/qusal/sys-ssh-agent/configure.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/configure.top b/qusal/sys-ssh-agent/configure.top index ce03ef1..bcba184 100644 --- a/qusal/sys-ssh-agent/configure.top +++ b/qusal/sys-ssh-agent/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/create.sls b/qusal/sys-ssh-agent/create.sls index bfabc73..a59befe 100644 --- a/qusal/sys-ssh-agent/create.sls +++ b/qusal/sys-ssh-agent/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/sys-ssh-agent/create.top b/qusal/sys-ssh-agent/create.top index 1809a71..98196d6 100644 --- a/qusal/sys-ssh-agent/create.top +++ b/qusal/sys-ssh-agent/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service index 99c727f..523de9f 100644 --- a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service +++ b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service index bc84b4a..fb8be9e 100644 --- a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service +++ b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/files/policy/default.policy b/qusal/sys-ssh-agent/files/policy/default.policy index b52a649..09efe40 100644 --- a/qusal/sys-ssh-agent/files/policy/default.policy +++ b/qusal/sys-ssh-agent/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent b/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent index a182ed2..b33ee18 100644 --- a/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent +++ b/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/files/server/bin/qvm-ssh-agent b/qusal/sys-ssh-agent/files/server/bin/qvm-ssh-agent index 064e237..b2a07f1 100755 --- a/qusal/sys-ssh-agent/files/server/bin/qvm-ssh-agent +++ b/qusal/sys-ssh-agent/files/server/bin/qvm-ssh-agent @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/files/server/systemd/qubes-ssh-agent-sock@.service b/qusal/sys-ssh-agent/files/server/systemd/qubes-ssh-agent-sock@.service index 4a6ae98..b0674a5 100644 --- a/qusal/sys-ssh-agent/files/server/systemd/qubes-ssh-agent-sock@.service +++ b/qusal/sys-ssh-agent/files/server/systemd/qubes-ssh-agent-sock@.service @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-ssh-agent/init.top b/qusal/sys-ssh-agent/init.top index efe9563..6725f70 100644 --- a/qusal/sys-ssh-agent/init.top +++ b/qusal/sys-ssh-agent/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/install-client.sls b/qusal/sys-ssh-agent/install-client.sls index 9cff4e7..09dab17 100644 --- a/qusal/sys-ssh-agent/install-client.sls +++ b/qusal/sys-ssh-agent/install-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/install-client.top b/qusal/sys-ssh-agent/install-client.top index 64dc193..4e868c6 100644 --- a/qusal/sys-ssh-agent/install-client.top +++ b/qusal/sys-ssh-agent/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/install.sls b/qusal/sys-ssh-agent/install.sls index 3158d9e..5bd6b43 100644 --- a/qusal/sys-ssh-agent/install.sls +++ b/qusal/sys-ssh-agent/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-ssh-agent/install.top b/qusal/sys-ssh-agent/install.top index 1a093c7..88c2dbf 100644 --- a/qusal/sys-ssh-agent/install.top +++ b/qusal/sys-ssh-agent/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/clone.sls b/qusal/sys-sshfs/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-sshfs/clone.sls +++ b/qusal/sys-sshfs/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/clone.top b/qusal/sys-sshfs/clone.top index f35b821..9b3896a 100644 --- a/qusal/sys-sshfs/clone.top +++ b/qusal/sys-sshfs/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/configure-client.sls b/qusal/sys-sshfs/configure-client.sls index 2f7d9bf..298277a 100644 --- a/qusal/sys-sshfs/configure-client.sls +++ b/qusal/sys-sshfs/configure-client.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/configure-client.top b/qusal/sys-sshfs/configure-client.top index 7f3c93b..effc333 100644 --- a/qusal/sys-sshfs/configure-client.top +++ b/qusal/sys-sshfs/configure-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/configure.sls b/qusal/sys-sshfs/configure.sls index 326b0fb..e9c8cdb 100644 --- a/qusal/sys-sshfs/configure.sls +++ b/qusal/sys-sshfs/configure.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/configure.top b/qusal/sys-sshfs/configure.top index 0fad6d4..c8b494c 100644 --- a/qusal/sys-sshfs/configure.top +++ b/qusal/sys-sshfs/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/create.sls b/qusal/sys-sshfs/create.sls index f0f58d0..806e2c1 100644 --- a/qusal/sys-sshfs/create.sls +++ b/qusal/sys-sshfs/create.sls @@ -1,10 +1,12 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone @@ -22,7 +24,7 @@ prefs: - netvm: "" - vcpus: 1 - memory: 300 -- maxmem: 700 +- maxmem: 600 - autostart: False - include_in_backups: True features: diff --git a/qusal/sys-sshfs/create.top b/qusal/sys-sshfs/create.top index 67c24c0..3cae880 100644 --- a/qusal/sys-sshfs/create.top +++ b/qusal/sys-sshfs/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/files/policy/default.policy b/qusal/sys-sshfs/files/policy/default.policy index 9140ff5..636ec22 100644 --- a/qusal/sys-sshfs/files/policy/default.policy +++ b/qusal/sys-sshfs/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-sshfs/install-client.sls b/qusal/sys-sshfs/install-client.sls index f60c6b2..4b99e9a 100644 --- a/qusal/sys-sshfs/install-client.sls +++ b/qusal/sys-sshfs/install-client.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/install-client.top b/qusal/sys-sshfs/install-client.top index bb97abb..236620e 100644 --- a/qusal/sys-sshfs/install-client.top +++ b/qusal/sys-sshfs/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/install.sls b/qusal/sys-sshfs/install.sls index aba464c..887584a 100644 --- a/qusal/sys-sshfs/install.sls +++ b/qusal/sys-sshfs/install.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-sshfs/install.top b/qusal/sys-sshfs/install.top index ae7e530..3833a34 100644 --- a/qusal/sys-sshfs/install.top +++ b/qusal/sys-sshfs/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/appmenus.sls b/qusal/sys-syncthing/appmenus.sls index 42bafd0..7b3e9c0 100644 --- a/qusal/sys-syncthing/appmenus.sls +++ b/qusal/sys-syncthing/appmenus.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/appmenus.top b/qusal/sys-syncthing/appmenus.top index 5686a06..40af751 100644 --- a/qusal/sys-syncthing/appmenus.top +++ b/qusal/sys-syncthing/appmenus.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/cancel.top b/qusal/sys-syncthing/cancel.top index 0c9fc94..cfd23eb 100644 --- a/qusal/sys-syncthing/cancel.top +++ b/qusal/sys-syncthing/cancel.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/clean.sls b/qusal/sys-syncthing/clean.sls index 1e58f97..9ac8f16 100644 --- a/qusal/sys-syncthing/clean.sls +++ b/qusal/sys-syncthing/clean.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/clone.sls b/qusal/sys-syncthing/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-syncthing/clone.sls +++ b/qusal/sys-syncthing/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/clone.top b/qusal/sys-syncthing/clone.top index 8b48a47..30058b2 100644 --- a/qusal/sys-syncthing/clone.top +++ b/qusal/sys-syncthing/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/configure.sls b/qusal/sys-syncthing/configure.sls index 7dde54d..6951f6d 100644 --- a/qusal/sys-syncthing/configure.sls +++ b/qusal/sys-syncthing/configure.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/configure.top b/qusal/sys-syncthing/configure.top index 0c9fc94..cfd23eb 100644 --- a/qusal/sys-syncthing/configure.top +++ b/qusal/sys-syncthing/configure.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/create.sls b/qusal/sys-syncthing/create.sls index 74bdd0f..5abae0a 100644 --- a/qusal/sys-syncthing/create.sls +++ b/qusal/sys-syncthing/create.sls @@ -1,10 +1,12 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/sys-syncthing/create.top b/qusal/sys-syncthing/create.top index ef205bf..8811b5e 100644 --- a/qusal/sys-syncthing/create.top +++ b/qusal/sys-syncthing/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/files/policy/default.policy b/qusal/sys-syncthing/files/policy/default.policy index d97327d..82692f7 100644 --- a/qusal/sys-syncthing/files/policy/default.policy +++ b/qusal/sys-syncthing/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-syncthing/init.top b/qusal/sys-syncthing/init.top index 3838684..d584d0b 100644 --- a/qusal/sys-syncthing/init.top +++ b/qusal/sys-syncthing/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/install.sls b/qusal/sys-syncthing/install.sls index e05d1ac..e5a3dff 100644 --- a/qusal/sys-syncthing/install.sls +++ b/qusal/sys-syncthing/install.sls @@ -1,6 +1,6 @@ {# SPDX-FileCopyrightText: 2022 - 2023 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-syncthing/install.top b/qusal/sys-syncthing/install.top index dd665a8..f0404dd 100644 --- a/qusal/sys-syncthing/install.top +++ b/qusal/sys-syncthing/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/clone.sls b/qusal/sys-usb/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/sys-usb/clone.sls +++ b/qusal/sys-usb/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/clone.top b/qusal/sys-usb/clone.top index 6494c6f..7a5c59c 100644 --- a/qusal/sys-usb/clone.top +++ b/qusal/sys-usb/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/create.sls b/qusal/sys-usb/create.sls index ae56f90..730c921 100644 --- a/qusal/sys-usb/create.sls +++ b/qusal/sys-usb/create.sls @@ -1,10 +1,12 @@ {# SPDX-FileCopyrightText: 2022 unman -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone - qvm.hide-usb-from-dom0 @@ -20,7 +22,6 @@ include: - qubes-ctap-dom0 #} -{# "{{ slsdotpath }}-absent": qvm.absent: - names: @@ -28,7 +29,6 @@ include: - sys-usb-dock - sys-usb-left - dvm-{{ slsdotpath }} -#} {% load_yaml as defaults -%} name: dvm-{{ slsdotpath }} diff --git a/qusal/sys-usb/create.top b/qusal/sys-usb/create.top index 1500a5e..f247496 100644 --- a/qusal/sys-usb/create.top +++ b/qusal/sys-usb/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/files/policy/default.policy b/qusal/sys-usb/files/policy/default.policy index e8f4eb5..4b575b0 100644 --- a/qusal/sys-usb/files/policy/default.policy +++ b/qusal/sys-usb/files/policy/default.policy @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/sys-usb/init.top b/qusal/sys-usb/init.top index 4eb722b..0839c2a 100644 --- a/qusal/sys-usb/init.top +++ b/qusal/sys-usb/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-cryptsetup.sls b/qusal/sys-usb/install-client-cryptsetup.sls index 434277d..c5290fd 100644 --- a/qusal/sys-usb/install-client-cryptsetup.sls +++ b/qusal/sys-usb/install-client-cryptsetup.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-cryptsetup.top b/qusal/sys-usb/install-client-cryptsetup.top index 39c0ef5..7912d66 100644 --- a/qusal/sys-usb/install-client-cryptsetup.top +++ b/qusal/sys-usb/install-client-cryptsetup.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-fido.sls b/qusal/sys-usb/install-client-fido.sls index fd01a1f..86d0239 100644 --- a/qusal/sys-usb/install-client-fido.sls +++ b/qusal/sys-usb/install-client-fido.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-fido.top b/qusal/sys-usb/install-client-fido.top index 2c7cc1f..dd13144 100644 --- a/qusal/sys-usb/install-client-fido.top +++ b/qusal/sys-usb/install-client-fido.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-proxy.sls b/qusal/sys-usb/install-client-proxy.sls index e137576..7ae9fe1 100644 --- a/qusal/sys-usb/install-client-proxy.sls +++ b/qusal/sys-usb/install-client-proxy.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client-proxy.top b/qusal/sys-usb/install-client-proxy.top index f0c8c4e..b2c0893 100644 --- a/qusal/sys-usb/install-client-proxy.top +++ b/qusal/sys-usb/install-client-proxy.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client.sls b/qusal/sys-usb/install-client.sls index b18e7d5..c7d0cb7 100644 --- a/qusal/sys-usb/install-client.sls +++ b/qusal/sys-usb/install-client.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install-client.top b/qusal/sys-usb/install-client.top index 32daa5d..b27c352 100644 --- a/qusal/sys-usb/install-client.top +++ b/qusal/sys-usb/install-client.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install.sls b/qusal/sys-usb/install.sls index 0fbea32..225f9b8 100644 --- a/qusal/sys-usb/install.sls +++ b/qusal/sys-usb/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/install.top b/qusal/sys-usb/install.top index d6b4aa5..253ef6f 100644 --- a/qusal/sys-usb/install.top +++ b/qusal/sys-usb/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/keyboard.sls b/qusal/sys-usb/keyboard.sls index a294c81..cfb8c0c 100644 --- a/qusal/sys-usb/keyboard.sls +++ b/qusal/sys-usb/keyboard.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/sys-usb/keyboard.top b/qusal/sys-usb/keyboard.top index e4e3034..2d054fc 100644 --- a/qusal/sys-usb/keyboard.top +++ b/qusal/sys-usb/keyboard.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/clone.sls b/qusal/terraform/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/terraform/clone.sls +++ b/qusal/terraform/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/clone.top b/qusal/terraform/clone.top index ec30293..6957580 100644 --- a/qusal/terraform/clone.top +++ b/qusal/terraform/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/create.sls b/qusal/terraform/create.sls index 7e27a24..de74ff6 100644 --- a/qusal/terraform/create.sls +++ b/qusal/terraform/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/terraform/create.top b/qusal/terraform/create.top index 4c38c83..0739962 100644 --- a/qusal/terraform/create.top +++ b/qusal/terraform/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/init.top b/qusal/terraform/init.top index 32c4ac5..2bf7404 100644 --- a/qusal/terraform/init.top +++ b/qusal/terraform/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/install.sls b/qusal/terraform/install.sls index 4fb2351..a69ac04 100644 --- a/qusal/terraform/install.sls +++ b/qusal/terraform/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/terraform/install.top b/qusal/terraform/install.top index 089257e..470cfa7 100644 --- a/qusal/terraform/install.top +++ b/qusal/terraform/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/macros/clone-template.sls b/qusal/utils/macros/clone-template.sls index f484755..ff7cac6 100644 --- a/qusal/utils/macros/clone-template.sls +++ b/qusal/utils/macros/clone-template.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/macros/install-repo.sls b/qusal/utils/macros/install-repo.sls index 517ac8e..f1d41ba 100644 --- a/qusal/utils/macros/install-repo.sls +++ b/qusal/utils/macros/install-repo.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/macros/policy.sls b/qusal/utils/macros/policy.sls index 264f45d..18fa762 100644 --- a/qusal/utils/macros/policy.sls +++ b/qusal/utils/macros/policy.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/macros/switch-template.sls b/qusal/utils/macros/switch-template.sls index 969194b..8231e5d 100644 --- a/qusal/utils/macros/switch-template.sls +++ b/qusal/utils/macros/switch-template.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/macros/sync-appmenus.sls b/qusal/utils/macros/sync-appmenus.sls index 95f752e..7672fd5 100644 --- a/qusal/utils/macros/sync-appmenus.sls +++ b/qusal/utils/macros/sync-appmenus.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/builder/core.sls b/qusal/utils/tools/builder/core.sls index 2e95b7c..c3f092d 100644 --- a/qusal/utils/tools/builder/core.sls +++ b/qusal/utils/tools/builder/core.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/builder/doc.sls b/qusal/utils/tools/builder/doc.sls index f698ea8..a5a6fcd 100644 --- a/qusal/utils/tools/builder/doc.sls +++ b/qusal/utils/tools/builder/doc.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/change-shell.sls b/qusal/utils/tools/zsh/change-shell.sls index f0980fd..15f9564 100644 --- a/qusal/utils/tools/zsh/change-shell.sls +++ b/qusal/utils/tools/zsh/change-shell.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/change-shell.top b/qusal/utils/tools/zsh/change-shell.top index 74456ad..ea8aa0e 100644 --- a/qusal/utils/tools/zsh/change-shell.top +++ b/qusal/utils/tools/zsh/change-shell.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/init.sls b/qusal/utils/tools/zsh/init.sls index 89bdb50..5ce534f 100644 --- a/qusal/utils/tools/zsh/init.sls +++ b/qusal/utils/tools/zsh/init.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/init.top b/qusal/utils/tools/zsh/init.top index 11ba672..d8ec343 100644 --- a/qusal/utils/tools/zsh/init.top +++ b/qusal/utils/tools/zsh/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/install.sls b/qusal/utils/tools/zsh/install.sls index db300b3..a270e21 100644 --- a/qusal/utils/tools/zsh/install.sls +++ b/qusal/utils/tools/zsh/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/install.top b/qusal/utils/tools/zsh/install.top index debbdcf..f40a575 100644 --- a/qusal/utils/tools/zsh/install.top +++ b/qusal/utils/tools/zsh/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/touch-zshrc.sls b/qusal/utils/tools/zsh/touch-zshrc.sls index 9dfa9e8..754fe19 100644 --- a/qusal/utils/tools/zsh/touch-zshrc.sls +++ b/qusal/utils/tools/zsh/touch-zshrc.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/utils/tools/zsh/touch-zshrc.top b/qusal/utils/tools/zsh/touch-zshrc.top index 51419ad..6b5c5ff 100644 --- a/qusal/utils/tools/zsh/touch-zshrc.top +++ b/qusal/utils/tools/zsh/touch-zshrc.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/clone.sls b/qusal/vault/clone.sls index 9391fbc..5e5c122 100644 --- a/qusal/vault/clone.sls +++ b/qusal/vault/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/clone.top b/qusal/vault/clone.top index c9c17f5..28ba926 100644 --- a/qusal/vault/clone.top +++ b/qusal/vault/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/create.sls b/qusal/vault/create.sls index a18e034..f63a4e1 100644 --- a/qusal/vault/create.sls +++ b/qusal/vault/create.sls @@ -1,9 +1,11 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} +{%- from "qvm/template.jinja" import load -%} + include: - .clone diff --git a/qusal/vault/create.top b/qusal/vault/create.top index 140886a..ebc3f20 100644 --- a/qusal/vault/create.top +++ b/qusal/vault/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/init.top b/qusal/vault/init.top index 72bf99d..6b8e3b5 100644 --- a/qusal/vault/init.top +++ b/qusal/vault/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/install.sls b/qusal/vault/install.sls index c35c318..0479645 100644 --- a/qusal/vault/install.sls +++ b/qusal/vault/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/vault/install.top b/qusal/vault/install.top index 0b8685a..8490f8b 100644 --- a/qusal/vault/install.top +++ b/qusal/vault/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/clone.sls b/qusal/whonix/clone.sls index a65e54f..be08f61 100644 --- a/qusal/whonix/clone.sls +++ b/qusal/whonix/clone.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/clone.top b/qusal/whonix/clone.top index 5ae0957..e178e1e 100644 --- a/qusal/whonix/clone.top +++ b/qusal/whonix/clone.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/create.sls b/qusal/whonix/create.sls index 3aed8b2..325b2ec 100644 --- a/qusal/whonix/create.sls +++ b/qusal/whonix/create.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/create.top b/qusal/whonix/create.top index fb3c1e3..766988c 100644 --- a/qusal/whonix/create.top +++ b/qusal/whonix/create.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/init.top b/qusal/whonix/init.top index fb3c1e3..766988c 100644 --- a/qusal/whonix/init.top +++ b/qusal/whonix/init.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/install.sls b/qusal/whonix/install.sls index c23907c..7809d24 100644 --- a/qusal/whonix/install.sls +++ b/qusal/whonix/install.sls @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/install.top b/qusal/whonix/install.top index 66be7ed..ab800ba 100644 --- a/qusal/whonix/install.top +++ b/qusal/whonix/install.top @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/qusal/whonix/template.jinja b/qusal/whonix/template.jinja index 409c940..789c46d 100644 --- a/qusal/whonix/template.jinja +++ b/qusal/whonix/template.jinja @@ -1,5 +1,5 @@ {# -SPDX-FileCopyrightText: 2023 Qusal contributors +SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. SPDX-License-Identifier: GPL-3.0-or-later #} diff --git a/rpm_spec/example.spec.tpl b/rpm_spec/example.spec.tpl index 7e79a6d..7b5a56a 100644 --- a/rpm_spec/example.spec.tpl +++ b/rpm_spec/example.spec.tpl @@ -1,6 +1,6 @@ # vim: ft=spec -# SPDX-FileCopyrightText: 2023 Qusal contributors +# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/salt-fix.sh b/scripts/salt-fix.sh index 19827a0..2bac8a2 100755 --- a/scripts/salt-fix.sh +++ b/scripts/salt-fix.sh @@ -3,7 +3,7 @@ ## SPDX-FileCopyrightText: 2013-2018 Will Thames will@thames.id.au ## SPDX-FileCopyrightText: 2018 Ansible by Red Hat ## SPDX-FileCopyrightText: 2020 - 2023 Warpnet B.V. -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/salt-lint.sh b/scripts/salt-lint.sh index 8460e9b..11fc8bf 100755 --- a/scripts/salt-lint.sh +++ b/scripts/salt-lint.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/setup.sh b/scripts/setup.sh index 8fd7fed..5096c95 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/shell-lint.sh b/scripts/shell-lint.sh index 54a64c6..8d74699 100755 --- a/scripts/shell-lint.sh +++ b/scripts/shell-lint.sh @@ -1,7 +1,7 @@ #!/bin/sh ## SPDX-FileCopyrightText: 2018 Andreas Kusalananda -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/spec-build.sh b/scripts/spec-build.sh index 4dbea59..d8a96cc 100755 --- a/scripts/spec-build.sh +++ b/scripts/spec-build.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/spec-gen.sh b/scripts/spec-gen.sh index c1a4b2f..b90979a 100755 --- a/scripts/spec-gen.sh +++ b/scripts/spec-gen.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/spec-get.sh b/scripts/spec-get.sh index bf7752c..6d512d7 100755 --- a/scripts/spec-get.sh +++ b/scripts/spec-get.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/update-toc.sh b/scripts/update-toc.sh index 474ec32..af3bf87 100755 --- a/scripts/update-toc.sh +++ b/scripts/update-toc.sh @@ -1,6 +1,6 @@ #!/bin/sh -## SPDX-FileCopyrightText: 2023 Qusal contributors +## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. ## ## SPDX-License-Identifier: GPL-3.0-or-later