summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* implementation of peer-to-peer protocolGravatar Joey Hess2016-11-17
| | | | | | | | | | | | | | | | For use with tor hidden services, and perhaps other transports later. Based on Utility.SimpleProtocol, it's a line-based protocol, interspersed with transfers of bytestrings of a specified size. Implementation of the local and remote sides of the protocol is done using a free monad. This lets monadic code be included here, without tying it to any particular way to get bytes peer-to-peer. This adds a dependency on the haskell package "free", although that was probably pulled in transitively from other dependencies already. This commit was sponsored by Jeff Goeke-Smith on Patreon.
* Merge branch 'master' into torGravatar Joey Hess2016-11-17
|\
| * avoid tab warnings from ghc 8Gravatar Joey Hess2016-11-17
| |
* | Merge branch 'master' into torGravatar Joey Hess2016-11-17
|\|
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-16
| |\
| * | arm build uses 32kb page sizeGravatar Joey Hess2016-11-16
| | | | | | | | | | | | (Change was made in gitannexbuilder scripts not here.)
| | * Added a comment: how about reusing the special remote protocol?Gravatar https://anarc.at/openid/2016-11-16
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-16
| |\
| * | devblogGravatar Joey Hess2016-11-16
| | |
| * | improve commentGravatar Joey Hess2016-11-16
| | |
| * | fsck --all --from was checking the content of files in the local repository, ↵Gravatar Joey Hess2016-11-16
| | | | | | | | | | | | | | | | | | | | | | | | rather than on the special remote. Straight up forgot to handle this case! This commit was sponsored by Fernando Jimenez on Patreon.
| * | moreinfo neededGravatar Joey Hess2016-11-16
| | |
| * | commentGravatar Joey Hess2016-11-16
| | |
| * | commentGravatar Joey Hess2016-11-16
| | |
| * | moreinfoGravatar Joey Hess2016-11-16
| | |
| * | commentGravatar Joey Hess2016-11-16
| | |
| * | commentGravatar Joey Hess2016-11-16
| | |
| * | already fixedGravatar Joey Hess2016-11-16
| | |
| * | commentGravatar Joey Hess2016-11-16
| | |
| | * (no commit message)Gravatar andrew2016-11-16
| | |
| | * Added a comment: how to investigateGravatar andrew2016-11-16
| |/
| * fix giveup shadowingGravatar Joey Hess2016-11-16
| |
| * allow Utility.Exception to still be used when not building with cabalGravatar Joey Hess2016-11-15
| |
| * remove debug printGravatar Joey Hess2016-11-15
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-15
| |\
| * | Avoid backtraces on expected failures when built with ghc 8; only use ↵Gravatar Joey Hess2016-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backtraces for unexpected errors. ghc 8 added backtraces on uncaught errors. This is great, but git-annex was using error in many places for a error message targeted at the user, in some known problem case. A backtrace only confuses such a message, so omit it. Notably, commands like git annex drop that failed due to eg, numcopies, used to use error, so had a backtrace. This commit was sponsored by Ethan Aubin.
| | * removedGravatar David_K2016-11-16
| | |
| | * Added a commentGravatar David_K2016-11-16
| | |
| | * Added a commentGravatar David_K2016-11-16
| |/
| * fix tricky warning with ghc 8Gravatar Joey Hess2016-11-15
| | | | | | | | | | Whether Route was exported from Assistant.WebApp.Types or not depended on the version of ghc. So, explictly export it.
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-15
| |\
| * | sync: Pass --allow-unrelated-histories to git merge when used with git git ↵Gravatar Joey Hess2016-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.9.0 or newer. This makes merging a remote into a freshly created direct mode repository work the same as it works in indirect mode. The git-annex branches would get merged in any case by a sync, since that doesn't use git merge. This might need to be revisited later to better mirror git's behavior.
| | * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-11-15
| |/
| * unbreak all the autobuildersGravatar Joey Hess2016-11-15
| | | | | | | | | | | | | | | | | | | | git-annex.cabal: Loosen bounds on persistent to allow 2.5, which on Debian has been patched to work with esqueleto. This may break cabal's resolver on non-Debian systems; if so, either use stack to build, or run cabal with --constraint='persistent ==2.2.4.1' Hopefully this mess with esqueleto will be resolved soon. https://github.com/prowdsponsor/esqueleto/issues/137
| * closeGravatar Joey Hess2016-11-15
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-15
| |\
| | * Added a commentGravatar christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb2016-11-15
| | |
| | * Added a comment: "Hmm, guyz? Are you serious with these scripts?" Well, ↵Gravatar https://launchpad.net/~stephane-gourichon-lpad2016-11-15
| | | | | | | | | | | | what's the matter?
| | * (no commit message)Gravatar thowz2016-11-15
| | |
| * | local lan detectionGravatar Joey Hess2016-11-14
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-11-14
| |\
| * | devblogGravatar Joey Hess2016-11-14
| | |
* | | use socket for tor hidden serviceGravatar Joey Hess2016-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids needing to bind to the right port before something else does. The socket is in /var/run/user/$uid/ which ought to be writable by only that uid. At least it is on linux systems using systemd. For Windows, may need to revisit this and use ports or something. The first version of tor to support sockets for hidden services was 0.2.6.3. That is not in Debian stable, but is available in backports. This commit was sponsored by andrea rota.
| * | no-xmpp branchGravatar Joey Hess2016-11-14
| | |
* | | git-annex enable-tor commandGravatar Joey Hess2016-11-14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tor unfortunately does not come out of the box configured to let hidden services register themselves on the fly via the ControlPort. And, changing the config to enable the ControlPort and a particular type of auth for it may break something already using the ControlPort, or lessen the security of the system. So, this leaves only one option to us: Add a hidden service to the torrc. git-annex enable-tor does so, and picks an unused high port for tor to listen on for connections to the hidden service. It's up to the caller to somehow pick a local port to listen on that won't be used by something else. That may be difficult to do.. This commit was sponsored by Jochen Bartl on Patreon.
* | updated designGravatar Joey Hess2016-11-14
| | | | | | | | more details on using tor and pairing
| * Added a comment: same on DebianGravatar gfa@1e86118cd41fbfea50004af221471ad97b55af182016-11-14
| |
| * (no commit message)Gravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2016-11-14
| |
| * Added a commentGravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2016-11-13
| |
| * Added additional comment about it working if I build from sourceGravatar mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f1992016-11-13
| |