diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-28 08:40:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-28 08:40:05 -0400 |
| commit | 3bdc5eb29077add9f2de18ba587ca88bb98cb63e (patch) | |
| tree | 6af319f70484495f2f9f79908bd8b2364ac01fed | |
| parent | c532be4c5deacf50659a54960c581a717c3b2f25 (diff) | |
will need gpg encryption for s3
| -rw-r--r-- | doc/git-annex.mdwn | 6 | ||||
| -rw-r--r-- | doc/special_remotes.mdwn | 1 | ||||
| -rw-r--r-- | doc/walkthrough/using_Amazon_S3.mdwn | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 6960c1966..c01f4fbc5 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -132,7 +132,7 @@ Many git-annex commands will stage changes for later `git commit` by you. by uuid. To change the description of the current repository, use "." -* s3bucket name description [datacenter host port] +* s3bucket name description [datacenter host port] [--key=gpgkey] Creates a bucket in Amazon S3. The bucket's name can be used to configure git remote using the bucket. @@ -142,6 +142,10 @@ Many git-annex commands will stage changes for later `git commit` by you. To use a different, S3-compatable service, specify a host and port. + By default, data (including filenames) is encrypted using gpg. + To use a key other than the default gpg key, specify it with + the --key option. To disable encryption, specify "none". + * fsck [path ...] With no parameters, this command checks the whole annex for consistency, diff --git a/doc/special_remotes.mdwn b/doc/special_remotes.mdwn index 7dc54fd9b..717ec4840 100644 --- a/doc/special_remotes.mdwn +++ b/doc/special_remotes.mdwn @@ -9,4 +9,5 @@ They cannot be used by other git commands though. ## Amazon S3 Stores file contents in a bucket in Amazon S3 or a similar service. +Content is stored encrypted by gpg. See [[walkthrough/using_Amazon_S3]] for examples. diff --git a/doc/walkthrough/using_Amazon_S3.mdwn b/doc/walkthrough/using_Amazon_S3.mdwn index cadd78582..8cb77ab6c 100644 --- a/doc/walkthrough/using_Amazon_S3.mdwn +++ b/doc/walkthrough/using_Amazon_S3.mdwn @@ -24,4 +24,6 @@ Now the remote can be used like any other remote. move video/hackity_hack_and_kaxxt.mov (to mys3...) ok An Amazon S3 remote works just like a ssh remote, except it does not have -a git repository at the other end, and it costs you money. :) +a git repository at the other end, and it costs you money. :) In particular, +all data is stored encrypted with gpg, so neither Amazon nor anyone in +between can see it. |