Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2024-10-01 02:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove extraneous package repository updates

Browse Source 
Updates happens multiple times, normally 2 to 3, even if we consider a
state without includes. On states with multiple includes, it could
easily get approximately 10 updates being ran. This behavior leads to
unnecessary network bandwidth being spent and more time to run the
installation state. When the connection is slow and not using the
cacher, such as torified connections on Whonix, the installation can
occurs much faster.

Adding external repositories has to be done prior to update to ensure it
is also fetched.

Fixes: https://github.com/ben-grande/qusal/issues/29
This commit is contained in:
Ben Grande 2024-03-18 16:29:01 +01:00
parent fc2af9b619
commit f9ead06408
96 changed files with 480 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/SALT.md
View File

@ -169,14 +169,14 @@ features:
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
{# Always update the package list before trying to install any package #} {# Always update the package list before trying to install any package #}
keys-updated: include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{# Install packages using Salt's pkg.installed module #} {# Install packages using Salt's pkg.installed module #}
keys-installed: keys-installed:
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
{# Enforce that we don't want to install recommended packages #} {# Enforce that we don't want to install recommended packages #}
- install_recommends: False - install_recommends: False
{# Enforce that we don't want to install suggested packages #} {# Enforce that we don't want to install suggested packages #}
@ -200,7 +200,8 @@ keys-installed:
{# Install the packages specific to the OS that this state is being applied #} {# Install the packages specific to the OS that this state is being applied #}
keys-installed-os-specific: keys-installed-os-specific:
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
{# Get the Jinja variable 'pkg.pkg' and convert it to an YAML list #} {# Get the Jinja variable 'pkg.pkg' and convert it to an YAML list #}

12
salt/ansible/install-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'ansible') }}
{% endif -%}

9
salt/ansible/install-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-ansible':
- ansible.install-repo

15
salt/ansible/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,16 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- .install-repo
- utils.tools.common.update
- utils.tools.zsh - utils.tools.zsh
- ssh.install - ssh.install
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -40,7 +40,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

12
salt/browser/install-chrome-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'chrome') }}
{% endif -%}

9
salt/browser/install-chrome-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-browser':
- browser.install-chrome-repo

11
salt/browser/install-chrome.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,22 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- .install-chrome-repo
- .install-common - .install-common
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'chrome') }}
"{{ slsdotpath }}-avoid-chrome-installing-own-repo": "{{ slsdotpath }}-avoid-chrome-installing-own-repo":
file.touch: file.touch:
- name: /etc/default/google-chrome - name: /etc/default/google-chrome
"{{ slsdotpath }}-updated-chrome":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-chrome": "{{ slsdotpath }}-installed-chrome":
pkg.installed: pkg.installed:
- refresh: True
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/browser/install-chromium.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .install-common - .install-common
"{{ slsdotpath }}-updated-chromium":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-chromium": "{{ slsdotpath }}-installed-chromium":
pkg.installed: pkg.installed:
- refresh: True - require:
- pkg: {{ slsdotpath }}.install-common
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/browser/install-common.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-usb.install-client-fido - sys-usb.install-client-fido
- sys-audio.install-client - sys-audio.install-client
"{{ slsdotpath }}-updated-common":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-common": "{{ slsdotpath }}-installed-common":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/browser/install-firefox.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .install-common - .install-common
"{{ slsdotpath }}-updated-firefox":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-firefox": "{{ slsdotpath }}-installed-firefox":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-common
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/browser/install-lynx.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -9,13 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .install-common - .install-common
"{{ slsdotpath }}-updated-lynx":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-lynx": "{{ slsdotpath }}-installed-lynx":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-common
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/browser/install-w3m.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -10,13 +10,10 @@ include:
- .install-common - .install-common
- dotfiles.copy-net - dotfiles.copy-net
"{{ slsdotpath }}-updated-w3m":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-w3m": "{{ slsdotpath }}-installed-w3m":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-common
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

7
salt/debian-minimal/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,13 +7,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' and grains['os_family']|lower == 'debian' -%} {% if grains['nodename'] != 'dom0' and grains['os_family']|lower == 'debian' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
- dev.home-cleanup - dev.home-cleanup
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-configure-locale": "{{ slsdotpath }}-configure-locale":
file.replace: file.replace:
- name: /etc/locale.gen - name: /etc/locale.gen

5
salt/debian-xfce/install.sls
View File

@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}

7
salt/debian/install.sls
View File

@ -1,13 +1,12 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}

10
salt/dev/install-python-tools.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated-python-tools": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed-python-tools": "{{ slsdotpath }}-installed-python-tools":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

13
salt/dev/install-salt-tools.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated-salt-tools": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed-salt-tools": "{{ slsdotpath }}-installed-salt-tools":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -29,7 +29,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
"{{ slsdotpath }}-installed-salt-tools-os-specific": "{{ slsdotpath }}-installed-salt-tools-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

14
salt/dev/install.sls
View File

@ -7,9 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
{%- if salt['qvm.exists']('sys-cacher') %} - utils.tools.common.update
- sys-cacher.install-client
{% endif %}
- .home-cleanup - .home-cleanup
- .install-python-tools - .install-python-tools
- .install-salt-tools - .install-salt-tools
@ -19,13 +17,10 @@ include:
- sys-git.install-client - sys-git.install-client
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -72,7 +67,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

9
salt/docker/install.sls
View File

@ -8,10 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- docker.install-repo - docker.install-repo
- utils.tools.common.update
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
{% set pkg = { {% set pkg = {
'Debian': { 'Debian': {
@ -35,7 +32,9 @@ include:
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/dom0/install-dev.sls
View File

@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] == 'dom0' -%} {% if grains['nodename'] == 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-git.install-client - sys-git.install-client
"{{ slsdotpath }}-dev-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-dev-installed": "{{ slsdotpath }}-dev-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

7
salt/dom0/install.sls
View File

@ -4,12 +4,9 @@ SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.co
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{%- from "qvm/template.jinja" import load -%}
{% if grains['nodename'] == 'dom0' -%} {% if grains['nodename'] == 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif -%} {% endif -%}

9
salt/dom0/kde.sls
View File

@ -1,17 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] == 'dom0' -%} {% if grains['nodename'] == 'dom0' -%}
"{{ slsdotpath }}-kde-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-kde-installed": "{{ slsdotpath }}-kde-installed":
pkg.installed: pkg.installed:
- require:
- sls: utils.tools.common.update
- pkgs: - pkgs:
- kde-settings-qubes - kde-settings-qubes
- sddm - sddm

8
salt/dom0/screenshot.sls
View File

@ -6,15 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] == 'dom0' -%} {% if grains['nodename'] == 'dom0' -%}
"{{ slsdotpath }}-screenshot-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-screenshot-installed": "{{ slsdotpath }}-screenshot-installed":
pkg.installed: pkg.installed:
- require: - require:
- pkg: "{{ slsdotpath }}-screenshot-updated" - sls: utils.tools.common.update
- refresh: True
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/dom0/xorg.sls
View File

@ -1,17 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] == 'dom0' -%} {% if grains['nodename'] == 'dom0' -%}
"{{ slsdotpath }}-xorg-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-xorg-allow-custom-xsession-login": "{{ slsdotpath }}-xorg-allow-custom-xsession-login":
pkg.installed: pkg.installed:
- require:
- sls: utils.tools.common.update
- pkgs: - pkgs:
- xorg-x11-xinit-session - xorg-x11-xinit-session

8
salt/electrum/install-builder.sls
View File

@ -7,20 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-builder-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-builder-installed": "{{ slsdotpath }}-builder-installed":
pkg.installed: pkg.installed:
- require: - require:
- pkg: "{{ slsdotpath }}-builder-updated" - sls: utils.tools.common.update
- refresh: True
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/electrum/install-distro.sls
View File

@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-distro-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-distro-installed": "{{ slsdotpath }}-distro-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/electrum/install.sls
View File

@ -7,14 +7,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-remove-distro-package": "{{ slsdotpath }}-remove-distro-package":
pkg.removed: pkg.removed:
- pkgs: - pkgs:
@ -24,9 +21,8 @@ include:
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- require: - require:
- sls: utils.tools.common.update
- pkg: "{{ slsdotpath }}-remove-distro-package" - pkg: "{{ slsdotpath }}-remove-distro-package"
- pkg: "{{ slsdotpath }}-updated"
- refresh: True
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

7
salt/fedora-minimal/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,10 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
{% endif %} {% endif %}

5
salt/fedora-xfce/install.sls
View File

@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}

7
salt/fedora/install.sls
View File

@ -1,13 +1,12 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}

8
salt/fetcher/install.sls
View File

@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-net - dotfiles.copy-net
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/kicksecure-minimal/install-developers.sls
View File

@ -16,15 +16,14 @@ https://www.qubes-os.org/doc/managing-vm-kernels/#distribution-kernel
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- kicksecure-minimal.install - kicksecure-minimal.install
"{{ slsdotpath }}-developers-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-developers-installed": "{{ slsdotpath }}-developers-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- sls: kicksecure-minimal.install
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/kicksecure-minimal/install.sls
View File

@ -10,16 +10,15 @@ https://www.kicksecure.com/wiki/Debian
include: include:
- kicksecure-minimal.install-repo - kicksecure-minimal.install-repo
- utils.tools.common.update
- sys-cacher.install-client - sys-cacher.install-client
- utils.tools.zsh - utils.tools.zsh
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: kicksecure-minimal.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/kicksecure-minimal/kernel-pv.sls
View File

@ -10,14 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .clone - .clone
- utils.tools.common.update
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/mail/install-fetcher.sls
View File

@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-net - dotfiles.copy-net
"{{ slsdotpath }}-fetcher-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-fetcher-installed": "{{ slsdotpath }}-fetcher-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- skip_suggestions: True - skip_suggestions: True
- install_recommends: False - install_recommends: False
- pkgs: - pkgs:

8
salt/mail/install-reader.sls
View File

@ -7,19 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-net - dotfiles.copy-net
- dotfiles.copy-mutt - dotfiles.copy-mutt
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-reader-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-reader-installed": "{{ slsdotpath }}-reader-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- skip_suggestions: True - skip_suggestions: True
- install_recommends: False - install_recommends: False
- pkgs: - pkgs:

8
salt/mail/install-sender.sls
View File

@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-net - dotfiles.copy-net
"{{ slsdotpath }}-sender-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-sender-installed": "{{ slsdotpath }}-sender-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- skip_suggestions: True - skip_suggestions: True
- install_recommends: False - install_recommends: False
- pkgs: - pkgs:

8
salt/media/install.sls
View File

@ -8,16 +8,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- browser.install - browser.install
- sys-audio.install-client - sys-audio.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/mgmt/install.sls
View File

@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/mirage-builder/install.sls
View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-ssh - dotfiles.copy-ssh
@ -16,13 +17,10 @@ include:
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
- docker.install - docker.install
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

12
salt/opentofu/install-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'opentofu') }}
{% endif -%}

9
salt/opentofu/install-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-opentofu':
- opentofu.install-repo

15
salt/opentofu/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,18 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- .install-repo
- utils.tools.common.update
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'opentofu') }}
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/qubes-builder/install-qubes-executor.sls
View File

@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated-qubes-executor": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed-qubes-executor": "{{ slsdotpath }}-installed-qubes-executor":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/qubes-builder/install.sls
View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-git - dotfiles.copy-git
- dotfiles.copy-net - dotfiles.copy-net
- dotfiles.copy-pgp - dotfiles.copy-pgp
@ -19,13 +20,10 @@ include:
- docker.install - docker.install
- .install-qubes-executor - .install-qubes-executor
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/reader/install.sls
View File

@ -7,13 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/remmina/install.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

12
salt/signal/install-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'docker') }}
{% endif -%}

9
salt/signal/install-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-qubes-builder':
- docker.install-repo

15
salt/signal/install.sls
View File

@ -1,25 +1,22 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'signal') }}
include: include:
- .install-repo
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
- sys-audio.install-client - sys-audio.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

11
salt/ssh/install.sls
View File

@ -7,17 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-ssh - dotfiles.copy-ssh
"{{ slsdotpath }}-client-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-client-installed": "{{ slsdotpath }}-client-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -35,7 +33,8 @@ include:
"{{ slsdotpath }}-client-installed-os-specific": "{{ slsdotpath }}-client-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

8
salt/sys-audio/install-bluetooth.sls
View File

@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- .install - .install
- sys-usb.install-client-proxy - sys-usb.install-client-proxy
"{{ slsdotpath }}-bluetooth-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-bluetooth-installed": "{{ slsdotpath }}-bluetooth-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

13
salt/sys-audio/install-client.sls
View File

@ -6,17 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
## qubes-usb-proxy: integrated camera and external USB.
include: include:
- utils.tools.common.update
## qubes-usb-proxy: integrated camera and external USB.
- sys-usb.install-client-proxy - sys-usb.install-client-proxy
"{{ slsdotpath }}-client-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-client-installed": "{{ slsdotpath }}-client-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -37,7 +35,8 @@ include:
"{{ slsdotpath }}-client-installed-os-specific": "{{ slsdotpath }}-client-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

11
salt/sys-audio/install.sls
View File

@ -7,16 +7,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-usb.install-client-proxy - sys-usb.install-client-proxy
- .install-client - .install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -38,7 +36,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

11
salt/sys-bitcoin/install-common.sls
View File

@ -7,19 +7,17 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dev.install-terminal - dev.install-terminal
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-sh - dotfiles.copy-sh
- whonix-workstation.install-nostart-tbb - whonix-workstation.install-nostart-tbb
"{{ slsdotpath }}-common-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-common-installed": "{{ slsdotpath }}-common-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -47,7 +45,8 @@ include:
"{{ slsdotpath }}-common-installed-os-specific": "{{ slsdotpath }}-common-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

10
salt/sys-bitcoin/install-source.sls
View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- .install-common - .install-common
- dotfiles.copy-ssh - dotfiles.copy-ssh
- dotfiles.copy-git - dotfiles.copy-git
@ -14,7 +15,8 @@ include:
"{{ slsdotpath }}-source-installed": "{{ slsdotpath }}-source-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -36,7 +38,8 @@ include:
"{{ slsdotpath }}-source-installed-os-specific": "{{ slsdotpath }}-source-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}
@ -53,7 +56,8 @@ include:
"{{ slsdotpath }}-source-qt-installed-os-specific": "{{ slsdotpath }}-source-qt-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

12
salt/sys-cacher/install.sls
View File

@ -1,24 +1,24 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include:
- utils.tools.common.update
"{{ slsdotpath }}-allow-testing-repository": "{{ slsdotpath }}-allow-testing-repository":
file.uncomment: file.uncomment:
- name: /etc/apt/sources.list.d/qubes-r4.list - name: /etc/apt/sources.list.d/qubes-r4.list
- regex: ^deb\s.*qubes-os.org.*-testing - regex: ^deb\s.*qubes-os.org.*-testing
- backup: False - backup: False
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-electrs/install-builder-source.sls
View File

@ -9,16 +9,14 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-git.install-client - sys-git.install-client
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-builder-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-builder-installed": "{{ slsdotpath }}-builder-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-electrs/install-source.sls
View File

@ -9,6 +9,7 @@ Source: https://github.com/romanz/electrs/blob/master/doc/install.md
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dev.install-terminal - dev.install-terminal
- dotfiles.copy-x11 - dotfiles.copy-x11
@ -18,13 +19,10 @@ include:
- sys-git.install-client - sys-git.install-client
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-source-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-source-installed": "{{ slsdotpath }}-source-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-electrumx/install-builder.sls
View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-x11 - dotfiles.copy-x11
- dotfiles.copy-sh - dotfiles.copy-sh
@ -14,13 +15,10 @@ include:
- sys-pgp.install-client - sys-pgp.install-client
- sys-git.install-client - sys-git.install-client
"{{ slsdotpath }}-builder-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-builder-installed": "{{ slsdotpath }}-builder-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-electrumx/install.sls
View File

@ -7,6 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-bitcoin.install-client - sys-bitcoin.install-client
- dev.home-cleanup - dev.home-cleanup
- dev.install-terminal - dev.install-terminal
@ -16,13 +17,10 @@ include:
- sys-pgp.install-client - sys-pgp.install-client
- sys-git.install-client - sys-git.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

2
salt/sys-firewall/create.sls
View File

@ -128,7 +128,7 @@ features:
{% set template_updatevm = salt['cmd.shell']("qrexec-policy tpl-sys-firewall @default qubes.UpdatesProxy 2>/dev/null | awk -F '=' '/^target=/{print $2}'") -%} {% set template_updatevm = salt['cmd.shell']("qrexec-policy tpl-sys-firewall @default qubes.UpdatesProxy 2>/dev/null | awk -F '=' '/^target=/{print $2}'") -%}
{% if template_updatevm -%} {% if template_updatevm -%}
"{{ slsdotpath }}-start-{{ template_updatevm }}-anticipate-network-use": "{{ slsdotpath }}-start-{{ template_updatevm }}-antecipate-network-use":
qvm.start: qvm.start:
- name: {{ template_updatevm }} - name: {{ template_updatevm }}
{% endif -%} {% endif -%}

8
salt/sys-firewall/install.sls
View File

@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-git/install-client.sls
View File

@ -5,18 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
include: include:
- utils.tools.common.update
- dotfiles.copy-git - dotfiles.copy-git
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-git/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-git - dotfiles.copy-git
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-x11 - dotfiles.copy-x11
- sys-pgp.install-client - sys-pgp.install-client
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-net/install-debug.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-net/install.sls
View File

@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

13
salt/sys-pgp/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dotfiles.copy-pgp - dotfiles.copy-pgp
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -35,7 +33,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

8
salt/sys-pihole/install.sls
View File

@ -10,16 +10,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% set pihole_tag = 'v5.17.2' -%} {% set pihole_tag = 'v5.17.2' -%}
include: include:
- utils.tools.common.update
- sys-cacher.uninstall-client - sys-cacher.uninstall-client
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-rsync/install-client.sls
View File

@ -1,19 +1,19 @@
{# {#
SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-client-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-client-installed": "{{ slsdotpath }}-client-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-rsync/install.sls
View File

@ -1,19 +1,19 @@
{# {#
SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

11
salt/sys-ssh-agent/install-client.sls
View File

@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-ssh - dotfiles.copy-ssh
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-client-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-client-installed": "{{ slsdotpath }}-client-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -37,7 +35,8 @@ include:
"{{ slsdotpath }}-client-installed-os-specific": "{{ slsdotpath }}-client-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

11
salt/sys-ssh-agent/install.sls
View File

@ -7,18 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
- dotfiles.copy-sh - dotfiles.copy-sh
- dotfiles.copy-ssh - dotfiles.copy-ssh
- dotfiles.copy-x11 - dotfiles.copy-x11
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -37,7 +35,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

10
salt/sys-ssh/install-client.sls
View File

@ -1,6 +1,6 @@
{# {#
SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -8,12 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
"{{ slsdotpath }}-client-updated":
pkg.uptodate:
- refresh: True
{% set pkg = { {% set pkg = {
'Debian': { 'Debian': {
'pkg': ['sshfs'], 'pkg': ['sshfs'],
@ -25,7 +22,8 @@ include:
"{{ slsdotpath }}-client-installed-os-specific": "{{ slsdotpath }}-client-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

10
salt/sys-ssh/install.sls
View File

@ -1,19 +1,19 @@
{# {#
SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

13
salt/sys-syncthing/install-client.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -30,7 +30,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

12
salt/sys-syncthing/install-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'syncthing') }}
{% endif -%}

9
salt/sys-syncthing/install-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-sys-syncthing':
- sys-syncthing.install-repo

15
salt/sys-syncthing/install.sls
View File

@ -1,22 +1,21 @@
{# {#
SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%} include:
{{ install_repo(sls_path, 'syncthing') }} - .install-repo
- utils.tools.common.update
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

8
salt/sys-usb/create.sls
View File

@ -9,15 +9,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
include: include:
- .clone - .clone
- utils.tools.common.update
- qvm.hide-usb-from-dom0 - qvm.hide-usb-from-dom0
"{{ slsdotpath }}-updated-dom0":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-dom0": "{{ slsdotpath }}-installed-dom0":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-usb/install-client-cryptsetup.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- .install-client-proxy - .install-client-proxy
"{{ slsdotpath }}-updated-cryptsetup":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-cryptsetup": "{{ slsdotpath }}-installed-cryptsetup":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-usb/install-client-fido.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- .install-client-proxy - .install-client-proxy
"{{ slsdotpath }}-updated-fido":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed-fido": "{{ slsdotpath }}-installed-fido":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-usb/install-client-proxy.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated-proxy": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed-proxy": "{{ slsdotpath }}-installed-proxy":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-usb/install.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

10
salt/sys-wireguard/install.sls
View File

@ -7,6 +7,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include:
- utils.tools.common.update
{# {#
"{{ slsdotpath }}-qvpn-group": "{{ slsdotpath }}-qvpn-group":
group.present: group.present:
@ -14,13 +17,10 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- system: True - system: True
#} #}
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

12
salt/terraform/install-repo.sls Normal file
View File

@ -0,0 +1,12 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% if grains['nodename'] != 'dom0' -%}
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'terraform') }}
{% endif -%}

9
salt/terraform/install-repo.top Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
base:
'tpl-terraform':
- terraform.install-repo

15
salt/terraform/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,18 +7,15 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- .install-repo
- utils.tools.common.update
- sys-ssh-agent.install-client - sys-ssh-agent.install-client
{% from 'utils/macros/install-repo.sls' import install_repo -%}
{{ install_repo(sls_path, 'terraform') }}
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: {{ slsdotpath }}.install-repo
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

17
salt/utils/macros/install-repo.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -39,8 +39,17 @@ If sls_path is 'browser', then this would install the repo from:
- group: root - group: root
- makedirs: True - makedirs: True
"{{ name }}-remove-{{ repo }}-old-format":
file.absent:
- require:
- file: "{{ name }}-install-{{ repo }}-keyring"
- name: /etc/apt/sources.list.d/{{ repo }}.list
"{{ name }}-install-{{ repo }}-repository": "{{ name }}-install-{{ repo }}-repository":
file.managed: file.managed:
- require:
- file: "{{ name }}-install-{{ repo }}-keyring"
- file: "{{ name }}-remove-{{ repo }}-old-format"
- name: /etc/apt/sources.list.d/{{ repo }}.sources - name: /etc/apt/sources.list.d/{{ repo }}.sources
- source: salt://{{ name }}/files/repo/{{ repo }}.sources - source: salt://{{ name }}/files/repo/{{ repo }}.sources
- mode: '0644' - mode: '0644'
@ -48,10 +57,6 @@ If sls_path is 'browser', then this would install the repo from:
- group: root - group: root
- makedirs: True - makedirs: True
"{{ name }}-remove-{{ repo }}-old-format":
file.absent:
- name: /etc/apt/sources.list.d/{{ repo }}.list
{% elif grains['os_family']|lower == 'redhat' -%} {% elif grains['os_family']|lower == 'redhat' -%}
"{{ name }}-install-{{ repo }}-keyring": "{{ name }}-install-{{ repo }}-keyring":
@ -65,6 +70,8 @@ If sls_path is 'browser', then this would install the repo from:
"{{ name }}-install-{{ repo }}-repository": "{{ name }}-install-{{ repo }}-repository":
file.managed: file.managed:
- require:
- file: "{{ name }}-install-{{ repo }}-keyring"
- name: /etc/yum.repos.d/{{ repo }}.repo - name: /etc/yum.repos.d/{{ repo }}.repo
- source: salt://{{ name }}/files/repo/{{ repo }}.yum.repo - source: salt://{{ name }}/files/repo/{{ repo }}.yum.repo
- mode: '0644' - mode: '0644'

13
salt/utils/tools/builder/core.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-core-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-core-installed": "{{ slsdotpath }}-core-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -38,7 +38,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
"{{ slsdotpath }}-core-installed-os-specific": "{{ slsdotpath }}-core-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

10
salt/utils/tools/builder/doc.sls
View File

@ -1,18 +1,18 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-doc-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
"{{ slsdotpath }}-doc-installed": "{{ slsdotpath }}-doc-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

9
salt/utils/tools/common/update.sls Normal file
View File

@ -0,0 +1,9 @@
{#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
"common-updated":
pkg.uptodate:
- refresh: True

8
salt/utils/tools/zsh/install.sls
View File

@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- utils.tools.zsh.touch-zshrc - utils.tools.zsh.touch-zshrc
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:

13
salt/vault/install.sls
View File

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -7,15 +7,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
include: include:
- utils.tools.common.update
- dev.home-cleanup - dev.home-cleanup
"{{ slsdotpath }}-updated":
pkg.uptodate:
- refresh: True
"{{ slsdotpath }}-installed": "{{ slsdotpath }}-installed":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
@ -33,7 +31,8 @@ include:
"{{ slsdotpath }}-installed-os-specific": "{{ slsdotpath }}-installed-os-specific":
pkg.installed: pkg.installed:
- refresh: True - require:
- sls: utils.tools.common.update
- install_recommends: False - install_recommends: False
- skip_suggestions: True - skip_suggestions: True
- pkgs: {{ pkg.pkg|sequence|yaml }} - pkgs: {{ pkg.pkg|sequence|yaml }}

7
salt/whonix-gateway/install.sls
View File

@ -1,13 +1,12 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}

7
salt/whonix-workstation/install.sls
View File

@ -1,13 +1,12 @@
{# {#
SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
"{{ slsdotpath }}-updated": include:
pkg.uptodate: - utils.tools.common.update
- refresh: True
{% endif %} {% endif %}