summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 17:08:03 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 17:08:03 -0400
commitfc5323ce2b17e86feefec668edc811d4ecbab726 (patch)
treeb858898ba87056cce01eb9e8501aa7d124eb7778
parentdfe5f77420d0e0ae2c943926d78df8c6c037ba6f (diff)
webapp: check that tor and magic wormhole are installed
-rw-r--r--Utility/Tor.hs3
-rw-r--r--git-annex.cabal2
2 files changed, 5 insertions, 0 deletions
diff --git a/Utility/Tor.hs b/Utility/Tor.hs
index 4e7c0ef43..37fbabd40 100644
--- a/Utility/Tor.hs
+++ b/Utility/Tor.hs
@@ -161,3 +161,6 @@ torLibDir = "/var/lib/tor"
varLibDir :: FilePath
varLibDir = "/var/lib"
+
+torIsInstalled :: IO Bool
+torIsInstalled = inPath "tor"
diff --git a/git-annex.cabal b/git-annex.cabal
index f6a4e1660..f2ba88979 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -227,6 +227,8 @@ Extra-Source-Files:
templates/configurators/rsync.net/encrypt.hamlet
templates/configurators/gitlab.com/add.hamlet
templates/configurators/needgcrypt.hamlet
+ templates/configurators/needtor.hamlet
+ templates/configurators/needmagicwormhole.hamlet
templates/configurators/enabledirectory.hamlet
templates/configurators/fsck/status.hamlet
templates/configurators/fsck/form.hamlet