Converts all SDW AppVMs to Debian 9

Makefile

@@ -37,6 +37,8 @@ sd-whonix: prep-salt ## Provisions SD Whonix VM
 
 sd-svs-disp: prep-salt ## Provisions SD Submission Viewing VM
 	sudo qubesctl top.enable sd-svs-disp
+	sudo qubesctl top.enable sd-svs-disp-files
+	sudo qubesctl --targets debian-9 state.highstate
 	sudo qubesctl --targets sd-svs-disp state.highstate
 
 clean-salt: assert-dom0 ## Purges SD Salt configuration from dom0

dom0/sd-gpg.sls

@@ -13,7 +13,7 @@ sd-gpg:
   qvm.vm:
     - name: sd-gpg
     - present:
-      - template: fedora-28
+      - template: debian-9
       - label: purple
     - prefs:
       - netvm: ""

dom0/sd-journalist.sls

@@ -39,7 +39,7 @@ sd-journalist:
 #
 install python-qt4 and python-futures:
   cmd.run:
-    - name: qvm-run -a whonix-ws-14 'sudo apt-get update && sudo apt-get install -qq python-futures python-qt4'
+    - name: qvm-run -a whonix-ws-14 'sudo apt-get update && sudo apt-get install -qq python-futures python3-pyqt4 gvfs-bin libgnomevfs2-bin'
 
 # When our Qubes bug is fixed, this will *not* be used
 sd-journalist-dom0-qubes.OpenInVM:

dom0/sd-svs-disp-files.sls

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+##
+# sd-svs-disp-files
+# ========
+#
+# Moves files into place on sd-svs-disp
+#
+##
+
+# xdg-open falls back to run-mailcap on debian-9, so CLI invocations
+# will not use gedit as intended. Let's force use of gedit via mailcap.
+sd-svs-force-gedit-for-xdg-open:
+  file.insert:
+    - name: /etc/mailcap
+    # User-defined (non-package-provided) overrides must be placed
+    # in a specific section of the mailcap file, otherwise they won't
+    # take precedence.
+    - after: "# ----- User Section Begins ----- #"
+    - text: "text/plain; gedit %s; test=test -x /usr/bin/gedit"
+
+sudo update-mime-database /usr/local/share/mime:
+  cmd.run
+
+sudo update-desktop-database /usr/local/share/applications:
+  cmd.run

dom0/sd-svs-disp-files.top

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+base:
+  # Target Debian-9, since changes to sd-svs-disp won't persist
+  debian-9:
+    - sd-svs-disp-files

dom0/sd-svs-disp.sls

@@ -15,7 +15,7 @@ sd-svs-disp:
   qvm.vm:
     - name: sd-svs-disp
     - present:
-      - template: fedora-28
+      - template: debian-9
       - label: green
     - prefs:
       - netvm: ""

dom0/sd-svs.sls

@@ -13,7 +13,7 @@ sd-svs:
   qvm.vm:
     - name: sd-svs
     - present:
-      - template: fedora-28
+      - template: debian-9
       - label: yellow
     - prefs:
       - netvm: ""

tests/test_gpg.py

@@ -10,9 +10,13 @@ def find_fp_from_gpg_output(gpg):
     lines = gpg.split("\n")
 
     for line in lines:
-        m = re.match('\s*Key fingerprint = (.*)$', line)
+        # dom0 uses Fedora25 with gpg 1.4.22, whereas AppVMs
+        # use Debian9 with gpg 2.1.18, so we'll match fingerprint
+        # by a loose regex rather than substring match.
+        regex = '\s*(Key fingerprint = )?([A-F0-9\s]{50})$'
+        m = re.match(regex, line)
         if m is not None:
-            fp = m.groups()[0]
+            fp = m.groups()[1]
             return fp
 
 

tests/test_vms_platform.py

@@ -5,7 +5,6 @@
 
 
 SUPPORTED_PLATFORMS = [
-    "Fedora 28 (Twenty Eight)",
     "Debian GNU/Linux 9 (stretch)",
 ]