Merge pull request #255 from freedomofpress/autostart-gpg-and-proxy

Autostart sd-proxy and sd-gpg at login
freedomofpress · May 16, 2019 · df47ffb · df47ffb
2 parents 300816f + 7d4be81
commit df47ffb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/dom0/sd-gpg.sls b/dom0/sd-gpg.sls
@@ -20,6 +20,7 @@ sd-gpg:
       - label: purple
     - prefs:
       - netvm: ""
+      - autostart: true
     - tags:
       - add:
         - sd-workstation

diff --git a/dom0/sd-proxy.sls b/dom0/sd-proxy.sls
@@ -32,6 +32,7 @@ sd-proxy:
     - prefs:
       - netvm: sd-whonix
       - kernelopts: "nopat apparmor=1 security=apparmor"
+      - autostart: true
     - tags:
       - add:
         - sd-workstation

diff --git a/tests/test_vms_exist.py b/tests/test_vms_exist.py
@@ -41,6 +41,7 @@ def test_sd_whonix_config(self):
         self.assertEqual(vm.kernelopts, wanted_kernelopts)
         self.assertTrue(vm.template == "whonix-gw-14")
         self.assertTrue(vm.provides_network)
+        self.assertTrue(vm.autostart is True)
         self.assertFalse(vm.template_for_dispvms)
         self.assertTrue('sd-workstation' in vm.tags)
 
@@ -51,6 +52,7 @@ def test_sd_proxy_config(self):
         wanted_kernelopts = "nopat apparmor=1 security=apparmor"
         self.assertEqual(vm.kernelopts, wanted_kernelopts)
         self.assertTrue(vm.template == "sd-proxy-template")
+        self.assertTrue(vm.autostart is True)
         self.assertFalse(vm.provides_network)
         self.assertFalse(vm.template_for_dispvms)
         self.assertTrue('sd-workstation' in vm.tags)
@@ -81,6 +83,7 @@ def test_sd_gpg_config(self):
         self.assertTrue(nvm is None)
         # No sd-gpg-template, since keyring is managed in $HOME
         self.assertTrue(vm.template == "sd-workstation-template")
+        self.assertTrue(vm.autostart is True)
         self.assertFalse(vm.provides_network)
         self.assertFalse(vm.template_for_dispvms)
         self._check_kernel(vm)