Munge /etc/tor/torrc in sd-whonix's /rw/config

This removes the duplicate directive from /etc/tor/torrc on boot.

Because anon-connection-wizard is the process that will clean up and repopulated the torrc, we must run it at boot and restart tor manually, bypassing anon-connection-wizard.

This should be resolved once anon-connection-wizard 4.2 is released upstream, see https://forums.whonix.org/t/configuring-onion-service/9042/37

dom0/sd-whonix-rsyslog-enable.sls

@@ -37,7 +37,9 @@ sd-rc-enable-logging:
             ln -sf /rw/config/sdlog.conf /etc/rsyslog.d/sdlog.conf
         fi
         systemctl restart rsyslog
+        # Munge torrc file and restart tor on boot instead of upstream's anon-connection-wizard
+        # see https://forums.whonix.org/t/configuring-onion-service/9042/37
+        sudo sed -i 's,^\%include /etc/torrc.d/95_whonix.conf,,' /etc/tor/torrc
+        sudo service tor restart
   cmd.run:
-    - name: ln -sf /rw/config/sd-rsyslog.conf /etc/sd-rsyslog.conf && systemctl restart rsyslog
-
-
+    - name: /rw/config/rc.local