summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Remote/S3real.hs7
-rw-r--r--doc/walkthrough/Internet_Archive_via_S3.mdwn2
2 files changed, 5 insertions, 4 deletions
diff --git a/Remote/S3real.hs b/Remote/S3real.hs
index 7d6b5d5ba..135966903 100644
--- a/Remote/S3real.hs
+++ b/Remote/S3real.hs
@@ -89,13 +89,14 @@ s3Setup u c = handlehost $ M.lookup "host" c
| otherwise = defaulthost
use fullconfig = do
- genBucket fullconfig
gitConfigSpecialRemote u fullconfig "s3" "true"
s3SetCreds fullconfig
defaulthost = do
c' <- encryptionSetup c
- use $ M.union c' defaults
+ let fullconfig = M.union c' defaults
+ genBucket fullconfig
+ use fullconfig
archiveorg = do
showNote $ "Internet Archive mode"
@@ -112,7 +113,7 @@ s3Setup u c = handlehost $ M.lookup "host" c
M.union c $
-- special constraints on key names
M.insert "mungekeys" "ia" $
- -- buckets created only as files
+ -- bucket created only when files
-- are uploaded
M.insert "x-amz-auto-make-bucket" "1" $
-- no default bucket name; should
diff --git a/doc/walkthrough/Internet_Archive_via_S3.mdwn b/doc/walkthrough/Internet_Archive_via_S3.mdwn
index 1d5fc88f5..b80f0a4b7 100644
--- a/doc/walkthrough/Internet_Archive_via_S3.mdwn
+++ b/doc/walkthrough/Internet_Archive_via_S3.mdwn
@@ -31,7 +31,7 @@ use all lowercase and no spaces when making the bucket with `initremote`.
host=s3.us.archive.org bucket=panama-canal-lock-blueprints \
x-archive-meta-mediatype=texts x-archive-meta-language=eng \
x-archive-meta-title="original Panama Canal lock design blueprints"
- initremote archive-panama (Internet Archive mode) (checking bucket) (creating bucket in US) ok
+ initremote archive-panama (Internet Archive mode) ok
# git annex describe archive-panama "Internet Archive item for my grandfather's Panama Canal lock design blueprints"
describe archive-panama ok