Makes sure that sdlog.conf file is in sd-whonix

dom0/sd-clean-all.sls

@@ -14,8 +14,12 @@ 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 systemctl restart rsyslog'
+      - qvm-run whonix-gw-15 'sudo rm -f /etc/apt/sources.list.d/securedrop_workstation.list'
       - qvm-run whonix-gw-15 'sudo apt remove -y securedrop-log'
+      - qvm-run whonix-gw-15 'sudo systemctl restart rsyslog'
+      - qvm-run whonix-gw-15 'sudo apt-key del 4ED79CC3362D7D12837046024A3BE4A92211B03C'
+
+
 
 remove-dom0-sdw-config-files:
   file.absent:

dom0/sd-whonix-rsyslog-enable.sls

@@ -13,6 +13,10 @@ sd-rsyslog-for-sd-whonix:
     - context:
         vmname: sd-whonix
 
+sd-rsyslog-sdlog-conf-for-sd-whonix:
+  file.managed:
+    - name: /rw/config/sdlog.conf
+    - source: "salt://sdlog.conf"
 
 sd-rc-enable-logging:
   file.blockreplace:
@@ -23,6 +27,9 @@ sd-rc-enable-logging:
     - content: |
         # Add sd-rsyslog.conf file for syslog
         ln -sf /rw/config/sd-rsyslog.conf /etc/sd-rsyslog.conf
+        if [ ! -f /etc/rsyslog.d/sdlog.conf ]; then
+            ln -sf /rw/config/sdlog.conf /etc/rsyslog.d/sdlog.conf
+        fi
         systemctl restart rsyslog
   cmd.run:
     - name: ln -sf /rw/config/sd-rsyslog.conf /etc/sd-rsyslog.conf && systemctl restart rsyslog

dom0/sdlog.conf

@@ -0,0 +1,4 @@
+module(load="omprog")
+action(type="omprog"
+       binary="/usr/sbin/sd-rsyslog"
+       template="RSYSLOG_TraditionalFileFormat")