Merge pull request #558 from freedomofpress/544-update-fedora-templat…

…e-on-package-install

Update Fedora TemplateVM on package install

VERSION

@@ -1 +1 @@
-0.3.0-rc1
+0.3.0-rc2

dom0/sd-sys-vms.sls

@@ -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

rpm-build/SPECS/securedrop-workstation-dom0-config.spec

@@ -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
@@ -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
@@ -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