From f10c276aaa0bfad5acb7b55d9e807c56b1133999 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 27 Dec 2024 16:14:26 -0500 Subject: [PATCH] torproxy: Don't disable apt-transport-tor in setup This was needed temporarily when migrating from Tor to Tor Proxy app. But now we should preserve the user's existing configuration during app upgrade. Tests: - Install Tor Proxy version 1. "Download software packages over Tor" is enabled. Upgrade to Tor Proxy version 2. "Download software packages over Tor" is still enabled. Signed-off-by: James Valleroy --- plinth/modules/torproxy/privileged.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plinth/modules/torproxy/privileged.py b/plinth/modules/torproxy/privileged.py index 0f66d43ea..93ea17d2d 100644 --- a/plinth/modules/torproxy/privileged.py +++ b/plinth/modules/torproxy/privileged.py @@ -26,10 +26,6 @@ TORPROXY_CONFIG_AUG = f'/files/{TORPROXY_CONFIG}' @privileged def setup(): """Setup Tor configuration.""" - # Disable default tor service. We will use tor@fbxproxy instance - # instead. - _disable_apt_transport_tor() - # Disable default Tor service. action_utils.service_disable('tor@default') # Mask the service to prevent re-enabling it by the Tor master service.