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.

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

Autostart sd-proxy and sd-gpg at login #255

Merged
merged 2 commits into from
May 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions dom0/sd-gpg.sls
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ sd-gpg:
- label: purple
- prefs:
- netvm: ""
- autostart: true
- tags:
- add:
- sd-workstation
Expand Down
1 change: 1 addition & 0 deletions dom0/sd-proxy.sls
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ sd-proxy:
- prefs:
- netvm: sd-whonix
- kernelopts: "nopat apparmor=1 security=apparmor"
- autostart: true
- tags:
- add:
- sd-workstation
Expand Down
3 changes: 3 additions & 0 deletions tests/test_vms_exist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down