summaryrefslogtreecommitdiff
path: root/Command/EnableTor.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-20 16:01:10 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-20 16:24:46 -0400
commite493cbaace4651d5e7da26834ab108cfae3df1dc (patch)
treec6c0ae6c9f7f3166a6fd29a28f08055fcb48a840 /Command/EnableTor.hs
parentd4a2f8c92ce3afe9b670938480a12d9c84566bfc (diff)
relocate tor socket out of /etc
weasel explained that apparmor limits on what files tor can read do not apply to sockets (because they're not files). And apparently the problems I was seeing with hidden services not being accessible had to do with onion address propigation and not the location of the socket file. remotedaemon looks up the HiddenServicePort in torrc, so if it was previously configured with the socket in /etc, that will still work. This commit was sponsored by Denis Dzyubenko on Patreon.
Diffstat (limited to 'Command/EnableTor.hs')
-rw-r--r--Command/EnableTor.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/EnableTor.hs b/Command/EnableTor.hs
index d24ecb2dc..c6d477b4e 100644
--- a/Command/EnableTor.hs
+++ b/Command/EnableTor.hs
@@ -30,6 +30,6 @@ start ps = case readish =<< headMaybe ps of
when (uuid == NoUUID) $
giveup "This can only be run in a git-annex repository."
(onionaddr, onionport) <- liftIO $
- addHiddenService userid (fromUUID uuid)
+ addHiddenService "tor-annex" userid (fromUUID uuid)
storeP2PAddress $ TorAnnex onionaddr onionport
stop