nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Add torsocks as required package, needed for diagnostics.

Browse Source 
Display error for diagnostic if command is missing.
This commit is contained in:
James Valleroy 2015-08-29 07:48:06 -04:00
parent dee7474b5e
commit 9a25e6b21d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/action_utils.py
View File

@ -268,6 +268,8 @@ def diagnose_url(url, kind=None, env=None, extra_options=None, wrapper=None,
# Authorization failed is a success # Authorization failed is a success
if exception.returncode == 6: if exception.returncode == 6:
result = 'passed' result = 'passed'
except FileNotFoundError:
result = 'error: missing command'
if kind: if kind:
return [_('Access URL {url} on tcp{kind}') return [_('Access URL {url} on tcp{kind}')

2
plinth/modules/tor/tor.py
View File

@ -55,7 +55,7 @@ def on_install():
actions.superuser_run('tor', ['setup']) actions.superuser_run('tor', ['setup'])
@package.required(['tor', 'obfsproxy'], on_install=on_install) @package.required(['tor', 'obfsproxy', 'torsocks'], on_install=on_install)
def index(request): def index(request):
"""Service the index page""" """Service the index page"""
status = get_status() status = get_status()