summaryrefslogtreecommitdiff
path: root/Remote/Helper
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-23 11:02:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-23 11:02:14 -0400
commit95b8c69c3ddb496f458d4b2e01e63750bc2a5e13 (patch)
tree1d6473d1c719a34a57ffa8e6e0cad46549370ad0 /Remote/Helper
parent33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (diff)
parent13c64bf59863b48d4051a512da33f025b56227ae (diff)
Merge branch 'master' into s3-aws
Diffstat (limited to 'Remote/Helper')
-rw-r--r--Remote/Helper/AWS.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs
index fb8af713a..1675e8a50 100644
--- a/Remote/Helper/AWS.hs
+++ b/Remote/Helper/AWS.hs
@@ -59,6 +59,9 @@ regionInfo service = map (\(t, r) -> (t, fromServiceRegion r)) $
[ ("US East (N. Virginia)", [S3Region "US", GlacierRegion "us-east-1"])
, ("US West (Oregon)", [BothRegion "us-west-2"])
, ("US West (N. California)", [BothRegion "us-west-1"])
+ -- Requires AWS4-HMAC-SHA256 which S3 library does not
+ -- currently support.
+ -- , ("EU (Frankfurt)", [BothRegion "eu-central-1"])
, ("EU (Ireland)", [S3Region "EU", GlacierRegion "eu-west-1"])
, ("Asia Pacific (Singapore)", [S3Region "ap-southeast-1"])
, ("Asia Pacific (Tokyo)", [BothRegion "ap-northeast-1"])