summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/special_remotes/S3.mdwn8
-rw-r--r--doc/tips/using_Amazon_S3.mdwn15
-rw-r--r--doc/todo/credentials-less_access_to_s3.mdwn2
-rw-r--r--doc/todo/credentials-less_access_to_s3/comment_3_26de94e8e3fefc9b47d1510bfb2dac9b._comment10
-rw-r--r--doc/todo/credentials-less_access_to_s3/comment_3_96c8bcb545578280dc02c00d82978f77._comment11
5 files changed, 26 insertions, 20 deletions
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn
index 2d9c6cfcd..33f0410bb 100644
--- a/doc/special_remotes/S3.mdwn
+++ b/doc/special_remotes/S3.mdwn
@@ -50,8 +50,12 @@ the S3 remote.
* `public` - Set to "yes" to allow public read access to files sent
to the S3 remote. This is accomplished by setting an ACL when each
- file is uploaded to the remote. So, it can be changed but changes
- will only affect subseqent uploads.
+ file is uploaded to the remote. So, changes to this setting will
+ only affect subseqent uploads.
+
+* `publicurl` - Configure the URL that is used to download files
+ from the bucket when they are available publically.
+ (This is automatically configured for Amazon S3 and the Internet Archive.)
* `partsize` - Amazon S3 only accepts uploads up to a certian file size,
and storing larger files requires a multipart upload process.
diff --git a/doc/tips/using_Amazon_S3.mdwn b/doc/tips/using_Amazon_S3.mdwn
index d6f621786..85d5bc958 100644
--- a/doc/tips/using_Amazon_S3.mdwn
+++ b/doc/tips/using_Amazon_S3.mdwn
@@ -22,16 +22,17 @@ Next, create the S3 remote, and describe it.
The configuration for the S3 remote is stored in git. So to make another
repository use the same S3 remote is easy:
- # cd /media/usb/annex
+ # export AWS_ACCESS_KEY_ID="08TJMT99S3511WOZEP91"
+ # export AWS_SECRET_ACCESS_KEY="s3kr1t"
# git pull laptop
# git annex enableremote cloud
enableremote cloud (gpg) (checking bucket) ok
-Now the remote can be used like any other remote.
+Notice that to enable an existing S3 remote, you have to provide the Amazon
+AWS credentials because they were not stored in the repository. (It is
+possible to configure git-annex to do that, but not the default.)
- # git annex copy my_cool_big_file --to cloud
- copy my_cool_big_file (gpg) (checking cloud...) (to cloud...) ok
- # git annex move video/hackity_hack_and_kaxxt.mov --to cloud
- move video/hackity_hack_and_kaxxt.mov (checking cloud...) (to cloud...) ok
+See [[public_Amazon_S3_remote]] for how to set up a Amazon S3 remote that
+can be used by the public, without them needing AWS credentials.
-See [[special_remotes/S3]] for details.
+See [[special_remotes/S3]] for details about configuring S3 remotes.
diff --git a/doc/todo/credentials-less_access_to_s3.mdwn b/doc/todo/credentials-less_access_to_s3.mdwn
index 39835ac1f..6816b3ff7 100644
--- a/doc/todo/credentials-less_access_to_s3.mdwn
+++ b/doc/todo/credentials-less_access_to_s3.mdwn
@@ -9,3 +9,5 @@ Besides, you never know if and when the file really is available on s3, so runni
How hard would it be to fix that in the s3 remote?
Thanks! --[[anarcat]]
+
+> [[done]] --[[Joey]]
diff --git a/doc/todo/credentials-less_access_to_s3/comment_3_26de94e8e3fefc9b47d1510bfb2dac9b._comment b/doc/todo/credentials-less_access_to_s3/comment_3_26de94e8e3fefc9b47d1510bfb2dac9b._comment
new file mode 100644
index 000000000..8a9ff4db2
--- /dev/null
+++ b/doc/todo/credentials-less_access_to_s3/comment_3_26de94e8e3fefc9b47d1510bfb2dac9b._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2015-06-05T20:17:38Z"
+ content="""
+The remote can indeed fallback when there are no creds.
+
+Also, git-annex can set an ACL on files it uploads, if the remote is
+configured with public=yes, so no manual ACL setting will be needed.
+"""]]
diff --git a/doc/todo/credentials-less_access_to_s3/comment_3_96c8bcb545578280dc02c00d82978f77._comment b/doc/todo/credentials-less_access_to_s3/comment_3_96c8bcb545578280dc02c00d82978f77._comment
deleted file mode 100644
index 52802de2a..000000000
--- a/doc/todo/credentials-less_access_to_s3/comment_3_96c8bcb545578280dc02c00d82978f77._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="joey"
- subject="""comment 3"""
- date="2015-06-05T17:28:52Z"
- content="""
-Based on
-<http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteEndpoints.html>
-and my testing, S3 does not default to allowing public access to buckets. So,
-this seems like something that it makes sense for the user to
-manually configure when setting up a s3 remote.
-"""]]