Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes package updates from sd-log AppVM config #535

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Removes package updates from sd-log AppVM config #535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dom0/sd-logging-setup.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
# vim: set syntax=yaml ts=2 sw=2 sts=2 et :

{% if "template" in grains['id'] or grains['id'] in ["securedrop-workstation-buster", "whonix-gw-15"] %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it would be best to explicitly list all the sd- managed template VMs here in a list, instead of relying on "template" in the name? It don't think there will be any functional improvements (due to sd-workstation.top), but it may make this part easier to understand/maintain

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally, we'd use qubesdb-read /qubes-vm-type and select based on whether the value is "TemplateVM". The salt jinja templates are rendered in dom0, though, and we currently cannot leverage onlyif to the problems we saw in #485, so settling on no changes for now.

include:
- fpf-apt-test-repo

{% if "template" in grains['id'] or grains['id'] in ["securedrop-workstation-buster", "whonix-gw-15"] %}
# Install securedrop-log package in TemplateVMs only
install-securedrop-log-package:
pkg.installed:
Expand Down