summaryrefslogtreecommitdiff
path: root/Remote/S3real.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Remote/S3real.hs')
-rw-r--r--Remote/S3real.hs7
1 files changed, 4 insertions, 3 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