Skip to content

Commit

Permalink
fix: remove cacher tag from Kicksecure template
Browse files Browse the repository at this point in the history
Running apt-cacher-ng-repo is during update is unnecessary, the
install-repo macro already does it and the systemd service is run on
boot before Qrexec Agent starts.

Fixes: #66
  • Loading branch information
ben-grande committed Jun 22, 2024
1 parent 19ea24d commit a6194e0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
3 changes: 0 additions & 3 deletions salt/kicksecure-minimal/create.sls
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,5 @@ features:
- appmenus-dispvm
- set:
- menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop"
tags:
- add:
- updatevm-sys-cacher
{%- endload %}
{{ load(defaults) }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
Description=Dynamically write repository definitions for use of apt-cacher-ng
After=qubes-misc-post.service
After=qubes-sysinit.service
## Run before Qrexec call (Salt, user on terminal, automatic update check)
## tries to update the package index.
Before=qubes-qrexec-agent.service
Before=qubes-update-check.service

[Service]
Expand Down
6 changes: 0 additions & 6 deletions salt/utils/tools/common/update.sls
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <[email protected]>
SPDX-License-Identifier: AGPL-3.0-or-later
#}

{% if salt['cmd.retcode']('command -v apt-cacher-ng-repo >/dev/null') == 0 -%}
"common-update-run-apt-cacher-ng-repo":
cmd.run:
- name: apt-cacher-ng-repo
{% endif -%}

"common-updated":
pkg.uptodate:
- refresh: True

0 comments on commit a6194e0

Please sign in to comment.