summaryrefslogtreecommitdiff
path: root/doc/special_remotes
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-11-06 14:26:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-11-06 14:26:01 -0400
commit3d1109b147f4976c69e73ad80659f59536e2bbf6 (patch)
tree552d912f19790fb154243f3ba2e68a61c32e7559 /doc/special_remotes
parent2a750922575bccc89dec1188613bfc60a98dba49 (diff)
reorder
Diffstat (limited to 'doc/special_remotes')
-rw-r--r--doc/special_remotes/S3.mdwn30
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn
index aac66abeb..5d161c3b8 100644
--- a/doc/special_remotes/S3.mdwn
+++ b/doc/special_remotes/S3.mdwn
@@ -18,24 +18,11 @@ the S3 remote.
* `encryption` - One of "none", "hybrid", "shared", or "pubkey".
See [[encryption]].
+* `keyid` - Specifies the gpg key to use for [[encryption]].
+
* `chunk` - Enables [[chunking]] when storing large files.
`chunk=1MiB` is a good starting point for chunking.
-* `partsize` - Amazon S3 only accepts uploads up to a certian file size,
- and storing larger files requires a multipart upload process.
-
- Setting `partsize=1GiB` is recommended for Amazon S3; this will
- cause multipart uploads to be done using parts up to 1GiB in size.
- Note that setting partsize to less than 100MiB will cause Amazon S3 to
- reject uploads.
-
- This is not enabled by default, since other S3 implementations may
- not support multipart uploads or have different limits,
- but can be enabled or changed at any time.
- time.
-
-* `keyid` - Specifies the gpg key to use for [[encryption]].
-
* `embedcreds` - Optional. Set to "yes" embed the login credentials inside
the git repository, which allows other clones to also access them. This is
the default when gpg encryption is enabled; the credentials are stored
@@ -60,6 +47,19 @@ the S3 remote.
so by default, a bucket name is chosen based on the remote name
and UUID. This can be specified to pick a bucket name.
+* `partsize` - Amazon S3 only accepts uploads up to a certian file size,
+ and storing larger files requires a multipart upload process.
+
+ Setting `partsize=1GiB` is recommended for Amazon S3 when not using
+ chunking; this will cause multipart uploads to be done using parts
+ up to 1GiB in size. Note that setting partsize to less than 100MiB
+ will cause Amazon S3 to reject uploads.
+
+ This is not enabled by default, since other S3 implementations may
+ not support multipart uploads or have different limits,
+ but can be enabled or changed at any time.
+ time.
+
* `fileprefix` - By default, git-annex places files in a tree rooted at the
top of the S3 bucket. When this is set, it's prefixed to the filenames
used. For example, you could set it to "foo/" in one special remote,