Skip to content

torproxy: Add separate app for Tor Proxy

James Valleroy requested to merge jvalleroy/freedombox:tor-proxy into master
  • Includes SocksPort and "Download software packages over Tor" feature, as well as setting upstream bridges.
  • "Download software packages over Tor" option is enabled by default.
  • When upgrading, if Tor app was enabled and "Download software packages over Tor" was enabled, then Tor Proxy will be installed.
  • The default tor instance is now called tor@default. The "tor" service is an multi-instance master that has Wants relation all instances.

Tests:

  • Tests for Tor and Tor Proxy passed.
  • Enable Tor, and run the tests for Tor Proxy. Afterwards, Tor is still enabled and running.
  • Enable Tor Proxy, and run the tests for Tor. Afterwards, Tor Proxy is still enabled and running.
  • Test setting upstream bridges for Tor and Tor Proxy.
  • Install FreedomBox 23.11 in a VM and install Tor with default settings. Install new FreedomBox version with Tor Proxy. After install, both Tor and Tor Proxy apps are installed and running. /etc/tor/instances/{plinth,fbxproxy}/torrc both have expected content.

Signed-off-by: James Valleroy jvalleroy@mailbox.org

Edited by James Valleroy

Merge request reports