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

Update Fedora TemplateVM on package install #558

Merged
merged 2 commits into from
May 26, 2020
Merged

Update Fedora TemplateVM on package install #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0edbbc
Update Fedora TemplateVM if it has just been installed via package ma…
emkll May 20, 2020
bb74dac
SecureDrop Workstation 0.3.0-rc2
emkll May 22, 2020
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 VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0-rc1
0.3.0-rc2
8 changes: 8 additions & 0 deletions dom0/sd-sys-vms.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ dom0-install-fedora-template:
- pkgs:
- qubes-template-{{ sd_supported_fedora_version }}

# If the VM has just been installed via package manager, update it immediately
update-fedora-template-if-new:
cmd.wait:
- name: sudo qubesctl --skip-dom0 --targets {{ sd_supported_fedora_version }} state.sls update.qubes-vm
- require:
- pkg: dom0-install-fedora-template
- watch:
- pkg: dom0-install-fedora-template
# qvm.default-dispvm is not strictly required here, but we want it to be
# updated as soon as possible to ensure make clean completes successfully, as
# is sets the default_dispvm to fedora-31-dvm
Expand Down
9 changes: 6 additions & 3 deletions rpm-build/SPECS/securedrop-workstation-dom0-config.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name: securedrop-workstation-dom0-config
Version: 0.3.0
Release: 0.rc1.1%{?dist}
Release: 0.rc2.1%{?dist}
Summary: SecureDrop Workstation

Group: Library
License: GPLv3+
URL: https://github.com/freedomofpress/securedrop-workstation
Source0: securedrop-workstation-dom0-config-0.3.0rc1.tar.gz
Source0: securedrop-workstation-dom0-config-0.3.0rc2.tar.gz

BuildArch: noarch
BuildRequires: python3-setuptools
Expand All @@ -28,7 +28,7 @@ configuration over time.
%undefine py_auto_byte_compile

%prep
%setup -n securedrop-workstation-dom0-config-0.3.0rc1
%setup -n securedrop-workstation-dom0-config-0.3.0rc2

%build
%{__python3} setup.py build
Expand Down Expand Up @@ -106,6 +106,9 @@ find /srv/salt -maxdepth 1 -type f -iname '*.top' \
| xargs qubesctl top.enable > /dev/null

%changelog
* Fri May 22 2020 SecureDrop Team <[email protected] - 0.3.0-rc2
- Upgrades sys-net, sys-firewall and sys-usb to Fedora31 TemplateVMs

* Tue May 19 2020 SecureDrop Team <[email protected] - 0.3.0-rc1
- Removes package updates from sd-log AppVM config
- Permit whitelisting VMs for copy/paste & copying logs via tags
Expand Down