Moves all whonix cleanup to one file

freedomofpress · Feb 19, 2020 · 3b186c1 · 3b186c1
1 parent 232c56f
commit 3b186c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/dom0/sd-clean-all.sls b/dom0/sd-clean-all.sls
@@ -10,16 +10,6 @@ set-fedora-as-default-dispvm:
 include:
   - sd-usb-autoattach-remove
 
-sd-cleanup-whonix-gw-15:
-  cmd.run:
-    - names:
-      - qvm-run whonix-gw-15 'sudo rm -f /etc/rsyslog.d/sdlog.conf'
-      - qvm-run whonix-gw-15 'sudo rm -f /etc/apt/sources.list.d/securedrop_workstation.list'
-      - qvm-run whonix-gw-15 'sudo systemctl restart rsyslog'
-      - qvm-run whonix-gw-15 'sudo apt-key del 4ED79CC3362D7D12837046024A3BE4A92211B03C'
-      - qvm-run whonix-gw-15 'sudo apt-key del 22245C81E3BAEB4138B36061310F561200F4AD77'
-
-
 
 remove-dom0-sdw-config-files:
   file.absent:

diff --git a/dom0/sd-clean-whonix.sls b/dom0/sd-clean-whonix.sls
@@ -8,4 +8,13 @@
 remove-securedrop-log-package-from-whonix:
   pkg.removed:
     - pkgs:
-      - securedrop-log
+      - securedrop-log
+
+sd-cleanup-whonix-gw-15:
+  cmd.run:
+    - names:
+      - sudo rm -f /etc/rsyslog.d/sdlog.conf
+      - sudo rm -f /etc/apt/sources.list.d/securedrop_workstation.list
+      - sudo systemctl restart rsyslog
+      - sudo apt-key del 4ED79CC3362D7D12837046024A3BE4A92211B03C
+      - sudo apt-key del 22245C81E3BAEB4138B36061310F561200F4AD77