mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
b0c75b7849
- 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>
53 lines
1.2 KiB
Python
53 lines
1.2 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""App manifest for Tor Proxy."""
|
|
|
|
from django.utils.translation import gettext_lazy as _
|
|
|
|
from plinth.clients import store_url
|
|
|
|
_ORBOT_PACKAGE_ID = 'org.torproject.android'
|
|
_TOR_BROWSER_DOWNLOAD_URL = \
|
|
'https://www.torproject.org/download/download-easy.html'
|
|
|
|
clients = [{
|
|
'name':
|
|
_('Tor Browser'),
|
|
'platforms': [{
|
|
'type': 'download',
|
|
'os': 'windows',
|
|
'url': _TOR_BROWSER_DOWNLOAD_URL,
|
|
}, {
|
|
'type': 'download',
|
|
'os': 'gnu-linux',
|
|
'url': _TOR_BROWSER_DOWNLOAD_URL,
|
|
}, {
|
|
'type': 'download',
|
|
'os': 'macos',
|
|
'url': _TOR_BROWSER_DOWNLOAD_URL,
|
|
}]
|
|
}, {
|
|
'name':
|
|
_('Orbot: Proxy with Tor'),
|
|
'platforms': [{
|
|
'type': 'store',
|
|
'os': 'android',
|
|
'store_name': 'google-play',
|
|
'url': store_url('google-play', _ORBOT_PACKAGE_ID)
|
|
}, {
|
|
'type': 'store',
|
|
'os': 'android',
|
|
'store_name': 'f-droid',
|
|
'url': store_url('f-droid', _ORBOT_PACKAGE_ID)
|
|
}]
|
|
}]
|
|
|
|
backup = {
|
|
'config': {
|
|
'directories': ['/etc/tor/instances/fbxproxy/'],
|
|
},
|
|
'secrets': {
|
|
'directories': ['/var/lib/tor-instances/fbxproxy/']
|
|
},
|
|
'services': ['tor@fbxproxy']
|
|
}
|