Commit graph

29069 commits

Author SHA1 Message Date
Joey Hess
b16a1cee4b
plumb peer uuid through to runLocal
This will allow updating transfer logs with the uuid.
2016-12-02 15:39:49 -04:00
Joey Hess
71ddb10699
initial implementation of P2P.Annex runner
Untested, and it does not yet update transfer logs.

Verifying transferred content is modeled on git-annex-shell recvkey.
In a direct mode or annex.thin repository, content can change while it's
being transferred. So, verification is always done, even if annex.verify
would normally prevent it.

Note that a WORM or URL key could change in a way the verification
doesn't catch. That can happen in git-annex-shell recvkey too. We don't
worry about it, because those key backends don't guarantee preservation
of data. (Which is to say, I worried about it, and then convinced myself
again it was ok.)
2016-12-02 14:54:33 -04:00
Joey Hess
c29f2e262a
catch non-IO exceptions too 2016-12-02 14:16:50 -04:00
Joey Hess
881274d021
make remote-daemon able to send and receive objects over tor
Each worker thread needs to run in the Annex monad, but the
remote-daemon's liftAnnex can only run 1 action at a time. Used
Annex.Concurrent to deal with that.

P2P.Annex is incomplete as of yet.
2016-12-02 13:52:43 -04:00
Joey Hess
7b7afbbedc
improve Local monad 2016-12-02 13:47:42 -04:00
Joey Hess
15dc63d47f
make sure that the specified number of bytes of DATA are always sent
It's possible, in direct or thin mode, that an object file gets
truncated or appended to as it's being sent. This would break the
protocol badly, so make sure never to send too many bytes, and to
close the protocol connection if too few bytes are available.
2016-12-02 13:45:45 -04:00
Joey Hess
3dce6a080e
cleanups 2016-12-01 00:42:01 -04:00
Joey Hess
94dad1e979
more flexible types for Proto runners
This will allow a runner in the Annex monad.
2016-12-01 00:27:07 -04:00
Joey Hess
00f48ac407
better comments 2016-11-30 23:54:00 -04:00
Joey Hess
e714e0f67a
actually check p2p authtokens for tor connections
This commit was sponsored by Ethan Aubin.
2016-11-30 16:46:02 -04:00
Joey Hess
b88e44ea9a
use P2P auth for git-remote-tor-annex
This changes the environment variable name to the more generic
GIT_ANNEX_P2P_AUTHTOKEN.

This commit was sponsored by andrea rota.
2016-11-30 15:26:55 -04:00
Joey Hess
3ab12ba923
implement p2p --link
This commit was sponsored by Riku Voipio.
2016-11-30 15:16:25 -04:00
Joey Hess
bfc8305814
implement p2p command 2016-11-30 14:35:24 -04:00
Joey Hess
ac0cb5c2cc
max authtoken length is 128
It was stopping at 128, so the 512 was only incorrect, it didn't change
behavior.
2016-11-30 14:19:26 -04:00
Joey Hess
568d81944a
avoid too-long command synopsis
It was making git-annex usage output columns far too wide
2016-11-30 14:16:57 -04:00
Joey Hess
24593aaa32
Merge branch 'master' into tor 2016-11-30 14:16:36 -04:00
Joey Hess
8354612131
prefer xdot over dot
* map: Run xdot if it's available in PATH. On OSX, the dot command
  does not support graphical display, while xdot does.
* Debian: xdot is a better interactive viewer than dot, so Suggest
  xdot, rather than graphviz.
2016-11-30 12:50:49 -04:00
Joey Hess
61a0be4fb0
supposedly unused import was used 2016-11-30 12:46:44 -04:00
Joey Hess
b039e5cc35
Merge branch 'master' into tor 2016-11-29 23:45:25 -04:00
Joey Hess
f872ef25c5
remove unused import 2016-11-29 23:44:54 -04:00
Joey Hess
53bf5cf8e6
cleanup 2016-11-29 17:52:46 -04:00
Joey Hess
2d42690394
devblog 2016-11-29 17:36:03 -04:00
Joey Hess
f86a7f673c
comments 2016-11-29 17:33:49 -04:00
Joey Hess
a173f85578
update docs for git-annex p2p command
It is not yet implemented.
2016-11-29 17:31:10 -04:00
Joey Hess
38425fdc39
finish git-annex enable-tor
Make it stash the address away for git-annex p2p to use later, rather
than outputting it. And, look up the UUID itself.
2016-11-29 17:30:27 -04:00
Joey Hess
398345cb26
Merge branch 'master' into tor 2016-11-29 15:45:29 -04:00
Joey Hess
2ad3420c19
fix 2016-11-29 15:43:34 -04:00
Joey Hess
87b325de71
enable remotedaemon when assistant is not enabled
Needed to serve tor hidden services.
2016-11-29 15:41:28 -04:00
Joey Hess
53b6d9057c
move tor hidden service socket to /etc, temporarily violating the FHS
On Debian, apparmor prevents tor from reading from most locations. And,
it silently fails if it is prevented from reading the hidden service
socket. I filed #846275 about this; violating the FHS is the least bad of a
bad set of choices until that bug is fixed.
2016-11-29 15:29:47 -04:00
Joey Hess
84358624c6
tighten added language
Removed part about neeing to install git-annex and git in the same
location. The installer checks if the location given exists, and if not,
tells the user that git is not installed there. And the default should
work if the user just picks it in both installers.
2016-11-29 13:37:16 -04:00
Joey Hess
87bd25fd51
Revert "Added link to Windows installation instructions. The page was not easy to find."
This reverts commit c68d4305eb.

With all due respect, the link to the instructions for each OS is in the
"detailed instructions" column. Adding a second link to the same thing
is unlikely to help.
2016-11-29 13:32:20 -04:00
Joey Hess
bccf7638a3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-11-29 13:32:10 -04:00
Joey Hess
c8d2595758
Windows autobuilder is going to be hosted at Dartmouth now 2016-11-29 12:05:37 -04:00
senatorzergling@c1d78877a6120a80f0f4005210eda262c1586555
fe310d1c35 Added more explanations of my experience with the Windows install process. 2016-11-29 15:13:16 +00:00
senatorzergling@c1d78877a6120a80f0f4005210eda262c1586555
c68d4305eb Added link to Windows installation instructions. The page was not easy to find. 2016-11-29 15:02:47 +00:00
db48x
91e33d6c95 2016-11-29 12:24:43 +00:00
palday@91f366b5178879146d2b6e1e53bfa21389ee89a8
5b9615d361 Added a comment: Temporary workaround until the brew formula is updated 2016-11-29 02:17:52 +00:00
https://launchpad.net/~felixonmars
7982826f89 Added a comment 2016-11-28 04:17:13 +00:00
https://launchpad.net/~felixonmars
02dd09a25d removed 2016-11-28 04:16:22 +00:00
https://launchpad.net/~felixonmars
f4d6c34f65 Added a comment 2016-11-28 04:12:18 +00:00
annexuser
36409ab5cf 2016-11-27 20:39:26 +00:00
boh
07504166ed Added a comment 2016-11-27 12:23:20 +00:00
CandyAngel
52ce3939b7 Added a comment 2016-11-25 20:27:07 +00:00
edaneault@c9ac084da568ceb4d4566371a2da53f847258e7e
afbc832eb8 2016-11-25 18:12:39 +00:00
edaneault@c9ac084da568ceb4d4566371a2da53f847258e7e
1b4bce0b0c 2016-11-25 18:10:54 +00:00
Joey Hess
3ed8895a09
fix build 2016-11-24 16:36:16 -04:00
davidriod@e75b369a4b1cced29c14354bce7493c61f00b1c7
d1ad4f1c00 Added a comment: Sharing rsync special remote between repository 2016-11-24 19:23:43 +00:00
Markus Hauru
9e2073f331
Fixed typo in Schedule.hs. 2016-11-24 07:37:33 -04:00
StephaneGourichon
27585f7569 Added a comment: Walkthrough of a prudent retroactive annex. 2016-11-24 11:27:59 +00:00
scottgorlin@a32946b2aad278883c1690a0753241583a9855b9
5c848b7225 Added a comment: IgnoreUnknown Include considered harmful? 2016-11-23 20:07:46 +00:00