mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

IA: do not create bucket at initremote time

Browse source 
This way, the metadata sent when uploading a file is applied to the bucket
then.
This commit is contained in:
Joey Hess 2011-05-16 13:10:26 -04:00
parent 93c5fb5da7
commit 0a7bcd47ae
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Remote/S3real.hs
View file

@ -89,13 +89,14 @@ s3Setup u c = handlehost $ M.lookup "host" c
| otherwise = defaulthost | otherwise = defaulthost
use fullconfig = do use fullconfig = do
genBucket fullconfig
gitConfigSpecialRemote u fullconfig "s3" "true" gitConfigSpecialRemote u fullconfig "s3" "true"
s3SetCreds fullconfig s3SetCreds fullconfig
defaulthost = do defaulthost = do
c' <- encryptionSetup c c' <- encryptionSetup c
use $ M.union c' defaults let fullconfig = M.union c' defaults
genBucket fullconfig
use fullconfig
archiveorg = do archiveorg = do
showNote $ "Internet Archive mode" showNote $ "Internet Archive mode"
@ -112,7 +113,7 @@ s3Setup u c = handlehost $ M.lookup "host" c
M.union c $ M.union c $
-- special constraints on key names -- special constraints on key names
M.insert "mungekeys" "ia" $ M.insert "mungekeys" "ia" $
-- buckets created only as files -- bucket created only when files
-- are uploaded -- are uploaded
M.insert "x-amz-auto-make-bucket" "1" $ M.insert "x-amz-auto-make-bucket" "1" $
-- no default bucket name; should -- no default bucket name; should

2
doc/walkthrough/Internet_Archive_via_S3.mdwn
View file

@ -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 \ host=s3.us.archive.org bucket=panama-canal-lock-blueprints \
x-archive-meta-mediatype=texts x-archive-meta-language=eng \ x-archive-meta-mediatype=texts x-archive-meta-language=eng \
x-archive-meta-title="original Panama Canal lock design blueprints" 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" # git annex describe archive-panama "Internet Archive item for my grandfather's Panama Canal lock design blueprints"
describe archive-panama ok describe archive-panama ok