include tor-annex in hidden service directory names

To make it easier to manage/delete them etc.

Backwards compatablity is preserved for existing tor configs.
This commit is contained in:
Joey Hess 2016-12-21 14:31:27 -04:00
parent 872064e4a6
commit 405fbd25e1
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 20 additions and 14 deletions

View file

@ -41,7 +41,7 @@ server th@(TransportHandle (LocalRepo r) _) = do
u <- liftAnnex th getUUID
uid <- getRealUserID
let ident = fromUUID u
go u =<< getHiddenServiceSocketFile uid ident
go u =<< getHiddenServiceSocketFile torAppName uid ident
where
go u (Just sock) = do
q <- newTBMQueueIO maxConnections