aboutsummaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-08 15:23:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-08 15:23:50 -0400
commit6328d368fc73de7c91cb6efa25769297df71897d (patch)
treee240f3d920c7f5bc3dd8f2f54d294497779a53a9 /Assistant.hs
parent9b09962ee86ec7531d7ca946e62ccf6a48a67399 (diff)
assistant: Now detects immediately when other repositories push changes to
a ssh remote, and pulls. XMPP is no longer needed in this configuration! Requires the remote server have git-annex-shell with notifychanges support. (untested) This commit was sponsored by Geog Wechslberger.
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 67398f23b..b5caceac2 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -21,6 +21,7 @@ import Assistant.Threads.Pusher
import Assistant.Threads.Merger
import Assistant.Threads.TransferWatcher
import Assistant.Threads.Transferrer
+import Assistant.Threads.RemoteControl
import Assistant.Threads.SanityChecker
import Assistant.Threads.Cronner
import Assistant.Threads.ProblemFixer
@@ -147,6 +148,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser =
, assist $ transferWatcherThread
, assist $ transferPollerThread
, assist $ transfererThread
+ , assist $ remoteControlThread
, assist $ daemonStatusThread
, assist $ sanityCheckerDailyThread urlrenderer
, assist $ sanityCheckerHourlyThread