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: Re-use loaded augeas

Browse Source
This commit is contained in:
James Valleroy 2016-09-11 20:54:31 -04:00 committed by Sunil Mohan Adapa
parent 5552853ee3
commit 6430ebbc71
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
actions/tor
View File

@ -144,22 +144,26 @@ def subcommand_get_status(_):
def subcommand_configure(arguments): def subcommand_configure(arguments):
"""Configure Tor.""" """Configure Tor."""
aug = augeas_load()
if arguments.service == 'disable': if arguments.service == 'disable':
_disable() _disable()
restart = arguments.service is None and \ restart = arguments.service is None and \
arguments.hidden_service is None and \ arguments.hidden_service is None and \
arguments.relay is None and arguments.bridge_relay is None arguments.relay is None and arguments.bridge_relay is None
_use_upstream_bridges(arguments.use_upstream_bridges, restart=restart) _use_upstream_bridges(arguments.use_upstream_bridges, restart=restart,
aug=aug)
restart = arguments.service is None and arguments.hidden_service is None restart = arguments.service is None and arguments.hidden_service is None
_enable_relay(arguments.relay, arguments.bridge_relay, restart=restart) _enable_relay(arguments.relay, arguments.bridge_relay, restart=restart,
aug=aug)
restart = arguments.service is None restart = arguments.service is None
if arguments.hidden_service == 'enable': if arguments.hidden_service == 'enable':
_enable_hs(restart=restart) _enable_hs(restart=restart, aug=aug)
elif arguments.hidden_service == 'disable': elif arguments.hidden_service == 'disable':
_disable_hs(restart=restart) _disable_hs(restart=restart, aug=aug)
if arguments.service == 'enable': if arguments.service == 'enable':
_enable() _enable()
@ -362,9 +366,10 @@ def _enable_relay(relay=None, bridge=None, restart=True, aug=None):
action_utils.service_restart('tor@plinth') action_utils.service_restart('tor@plinth')
def _enable_hs(restart=True): def _enable_hs(restart=True, aug=None):
"""Enable Tor hidden service""" """Enable Tor hidden service"""
aug = augeas_load() if not aug:
aug = augeas_load()
if _get_hidden_service(aug)['enabled']: if _get_hidden_service(aug)['enabled']:
return return
@ -393,9 +398,10 @@ def _enable_hs(restart=True):
time.sleep(10) time.sleep(10)
def _disable_hs(restart=True): def _disable_hs(restart=True, aug=None):
"""Disable Tor hidden service""" """Disable Tor hidden service"""
aug = augeas_load() if not aug:
aug = augeas_load()
if not _get_hidden_service(aug)['enabled']: if not _get_hidden_service(aug)['enabled']:
return return