From 7afd5dd32d501ea74ea7e7899532b1dfcd53b96c Mon Sep 17 00:00:00 2001 From: mridulnagpal Date: Tue, 13 Dec 2016 22:21:10 +0530 Subject: [PATCH] tor: Disable tor service (replaced by tor@plinth) --- actions/tor | 12 +++++++----- data/usr/share/augeas/lenses/tests/test_tor.aug | 1 + data/usr/share/augeas/lenses/tor.aug | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/actions/tor b/actions/tor index 5a8512938..cb92c0c2c 100755 --- a/actions/tor +++ b/actions/tor @@ -39,7 +39,7 @@ from plinth.modules.tor.utils import get_real_apt_uri_path, iter_apt_uris, \ SERVICE_FILE = '/etc/firewalld/services/tor-{0}.xml' TOR_CONFIG = '/files/etc/tor/instances/plinth/torrc' TOR_STATE_FILE = '/var/lib/tor-instances/plinth/state' -TOR_AUTH_COOKIE = '/var/run/tor/control.authcookie' +TOR_AUTH_COOKIE = '/var/run/tor-instances/plinth/control.authcookie' def parse_arguments(): @@ -70,7 +70,9 @@ def parse_arguments(): def subcommand_setup(_): """Setup Tor configuration after installing it.""" - subprocess.run(['tor-instance-create', 'plinth']) + _disable_apt_transport_tor() + action_utils.service_disable('tor') + subprocess.run(['tor-instance-create', 'plinth'], check=True) aug = augeas_load() @@ -92,7 +94,7 @@ def subcommand_setup(_): aug.set(TOR_CONFIG + '/DNSPort[2]', '[::1]:9053') aug.set(TOR_CONFIG + '/HiddenServiceDir', - '/var/lib/tor/hidden_service') + '/var/lib/tor-instances/plinth/hidden_service') aug.set(TOR_CONFIG + '/HiddenServicePort[1]', '22 127.0.0.1:22') aug.set(TOR_CONFIG + '/HiddenServicePort[2]', @@ -102,7 +104,7 @@ def subcommand_setup(_): aug.save() - action_utils.service_restart('tor') + action_utils.service_restart('tor@plinth') _update_ports() # wait until hidden service information is available @@ -288,7 +290,7 @@ def _enable_hs(restart=True): return aug.set(TOR_CONFIG + '/HiddenServiceDir', - '/var/lib/tor/hidden_service') + '/var/lib/tor-instances/plinth/hidden_service') aug.set(TOR_CONFIG + '/HiddenServicePort[1]', '22 127.0.0.1:22') aug.set(TOR_CONFIG + '/HiddenServicePort[2]', diff --git a/data/usr/share/augeas/lenses/tests/test_tor.aug b/data/usr/share/augeas/lenses/tests/test_tor.aug index 73f09cfb1..c73c55088 100644 --- a/data/usr/share/augeas/lenses/tests/test_tor.aug +++ b/data/usr/share/augeas/lenses/tests/test_tor.aug @@ -9,3 +9,4 @@ test Tor.lns get "ExitPolicy reject *:*\n" = { "ExitPolicy" = "reject *:*" } test Tor.lns get "VirtualAddrNetworkIPv4 10.192.0.0/10\n" = { "VirtualAddrNetworkIPv4" = "10.192.0.0/10" } test Tor.lns get "ServerTransportPlugin obfs3,obfs4 exec /usr/bin/obfs4proxy\n" = { "ServerTransportPlugin" = "obfs3,obfs4 exec /usr/bin/obfs4proxy" } test Tor.lns get "HiddenServiceDir /var/lib/tor/hidden_service/\n" = { "HiddenServiceDir" = "/var/lib/tor/hidden_service/" } +test Tor.lns get "+SocksPort auto" = { "SocksPort" = "auto" } diff --git a/data/usr/share/augeas/lenses/tor.aug b/data/usr/share/augeas/lenses/tor.aug index 60208c101..6dfe46f36 100644 --- a/data/usr/share/augeas/lenses/tor.aug +++ b/data/usr/share/augeas/lenses/tor.aug @@ -22,7 +22,7 @@ autoload xfm let eol = Util.eol let ws = /[ \t]/ -let kc = /[A-Za-z0-9_.,:*]/ +let kc = /[A-Za-z0-9_.,:*+]/ let vc = /[A-Za-z0-9_.,:*\/ ]/ let keyname = kc+ let val = /[[\/]*/ . kc . (vc* . /[]]*/ . vc* . kc . /[\/]*/)?