nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Use plinth instance

Browse Source
This commit is contained in:
mridulnagpal 2016-12-10 13:31:50 +05:30 committed by James Valleroy
parent 24943ebe15
commit 9f2521ce76
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/tor
View File

@ -36,7 +36,7 @@ from plinth.modules.tor.utils import get_real_apt_uri_path, iter_apt_uris, \
APT_TOR_PREFIX APT_TOR_PREFIX
SERVICE_FILE = '/etc/firewalld/services/tor-{0}.xml' SERVICE_FILE = '/etc/firewalld/services/tor-{0}.xml'
TOR_CONFIG = '/files/etc/tor/torrc' TOR_CONFIG = '/files/etc/tor/instances/plinth/torrc'
TOR_STATE_FILE = '/var/lib/tor/state' TOR_STATE_FILE = '/var/lib/tor/state'
TOR_AUTH_COOKIE = '/var/run/tor/control.authcookie' TOR_AUTH_COOKIE = '/var/run/tor/control.authcookie'
@ -236,14 +236,14 @@ def _get_hidden_service(aug=None):
def _enable(): def _enable():
"""Enable and start the service.""" """Enable and start the service."""
action_utils.service_enable('tor') action_utils.service_enable('tor@plinth')
_update_ports() _update_ports()
def _disable(): def _disable():
"""Disable and stop the service.""" """Disable and stop the service."""
_disable_apt_transport_tor() _disable_apt_transport_tor()
action_utils.service_disable('tor') action_utils.service_disable('tor@plinth')
def _enable_relay(relay=None, bridge=None, restart=True, aug=None): def _enable_relay(relay=None, bridge=None, restart=True, aug=None):