Commit graph

10473 commits

Author SHA1 Message Date
Joey Hess
df88c51334 add uuid to all xmpp messages
(Except for the actual streaming of receive-pack through XMPP, which
can only run once we've gotten an appropriate uuid in a push initiation
message.)

Pushes are now only initiated when the initiation message comes from a
known uuid. This allows multiple distinct repositories to use the same xmpp
address.

Note: This probably breaks initial push after xmpp pairing, because at that
point we may not know about the paired uuid, and so reject the push from
it. It won't break in simple cases, because the annex-uuid of the remote
is checked. However, when there are multiple clients behind a single xmpp
address, only uuid of the first is recorded in annex-uuid, and so any
pushes from the others will be rejected (unless the first remote pushes their
uuids to us beforehand.
2013-04-30 13:22:55 -04:00
Joey Hess
343f989c14 close 2013-04-28 13:31:13 -04:00
http://joeyh.name/
9a58188876 removed 2013-04-27 21:26:47 +00:00
http://joeyh.name/
855aec825b Added a comment 2013-04-27 21:26:11 +00:00
http://joeyh.name/
1658fcbccb Added a comment 2013-04-27 21:13:23 +00:00
Joey Hess
02e4bb0da9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 17:07:47 -04:00
Joey Hess
abd85d9f3d blog for the day 2013-04-27 17:05:27 -04:00
Joey Hess
883b17af01 Store an annex-uuid file in the bucket when setting up a new S3 remote. 2013-04-27 17:01:24 -04:00
http://edheil.wordpress.com/
b324492929 Added a comment 2013-04-27 20:51:03 +00:00
Joey Hess
bda4a6c56f Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 15:56:47 -04:00
http://joeyh.name/
f967e34f5f Added a comment 2013-04-27 19:54:42 +00:00
http://joeyh.name/
d6e2f44bee Added a comment 2013-04-27 19:35:15 +00:00
Joey Hess
503be0c53e there are multiple free options now, de-emphasize "free" 2013-04-27 15:19:27 -04:00
Joey Hess
c3498042fd webapp: Now automatically fills in any creds used by an existing remote when creating a new remote of the same type. Done for Internet Archive, S3, Glacier, and Box.com remotes. 2013-04-27 15:16:06 -04:00
http://joeyh.name/
165fb8c571 removed 2013-04-27 17:25:19 +00:00
https://pradermecker.myopenid.com/
1a4ea6fb7b Added a comment 2013-04-27 17:14:43 +00:00
Joey Hess
8626e67e97 update 2013-04-27 13:00:57 -04:00
Joey Hess
cfaee41cf4 add 2013-04-27 12:43:58 -04:00
Joey Hess
767084af54 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 11:22:30 -04:00
Joey Hess
8bf07b530f update 2013-04-27 11:21:58 -04:00
Joey Hess
4d5d8c2f85 update, add fmarier PPA 2013-04-27 11:21:48 -04:00
fmarier
60f4bb9509 Added a comment: My PPA (Ubuntu Precise) has git-annex 4.20130417 2013-04-27 11:12:27 +00:00
http://edheil.wordpress.com/
d97bb05856 Added a comment 2013-04-27 05:45:54 +00:00
http://joeyh.name/
63e0af2252 Added a comment 2013-04-26 22:25:04 +00:00
Joey Hess
5326d25205 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-26 18:23:34 -04:00
Joey Hess
acf8b257ba blog for the day 2013-04-26 18:23:06 -04:00
Joey Hess
85d83e7756 To enable an existing special remote, the new enableremote command must be used. The initremote command now is used only to create new special remotes. 2013-04-26 18:22:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
a3788d3268 Added a comment 2013-04-26 21:16:30 +00:00
http://joeyh.name/
6582be8c98 Added a comment 2013-04-26 20:52:37 +00:00
Joey Hess
9a24728d95 fix build stamps 2013-04-26 16:43:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
5d6300fb91 Added a comment 2013-04-26 20:37:51 +00:00
http://joeyh.name/
e7b07c0508 Added a comment 2013-04-26 20:33:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
80c5c6a0ff Added a comment 2013-04-26 20:21:06 +00:00
Joey Hess
8a7e059f54 fix build w/o s3 2013-04-26 16:12:23 -04:00
http://joeyh.name/
bc0ce39db9 Added a comment 2013-04-26 20:06:34 +00:00
Joey Hess
440d6e331f tweak
This works around a bug in the EvilSplicer
2013-04-26 15:20:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
7ec5454ff7 Added a comment 2013-04-26 19:10:15 +00:00
Joey Hess
31c7ddd648 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-26 15:06:54 -04:00
Joey Hess
b4f4ed7d93 fix build with newer yesod 2013-04-26 15:06:18 -04:00
http://edheil.wordpress.com/
f5f5f44f43 Added a comment 2013-04-26 17:46:50 +00:00
http://edheil.wordpress.com/
a3a1cb8e3a 2013-04-26 17:18:01 +00:00
Joey Hess
d660a76c33 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-26 13:01:28 -04:00
Joey Hess
8603109294 allow configuring the preferreddir 2013-04-26 13:01:06 -04:00
https://launchpad.net/~maestro-alubia
3fb7ffc138 2013-04-26 09:56:26 +00:00
https://launchpad.net/~maestro-alubia
e356a80a6d 2013-04-26 09:53:55 +00:00
https://launchpad.net/~maestro-alubia
f17addbbc6 2013-04-26 09:52:15 +00:00
https://launchpad.net/~maestro-alubia
2d78fb8ab9 2013-04-26 09:51:36 +00:00
Joey Hess
867cba52a0 better default collections 2013-04-26 01:46:07 -04:00
Joey Hess
a86a34ae73 update 2013-04-26 01:00:58 -04:00
Joey Hess
77864d188b update 2013-04-26 00:00:46 -04:00