diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-01 14:11:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-01 14:11:37 -0400 |
| commit | aab3d3bd922be355ce0df9616de54c789a2b9411 (patch) | |
| tree | cc88f7cb174a60eae7ed9f25d2d070ee8ec0a560 /Remote/S3.hs | |
| parent | 2696ed67ebb4a3be994ff35567bdc74459d9f0bf (diff) | |
webapp: S3 and Glacier forms now have a select list of all currently-supported AWS regions.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 512b3f778..e50145f61 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -11,6 +11,7 @@ import Network.AWS.AWSConnection import Network.AWS.S3Object import Network.AWS.S3Bucket hiding (size) import Network.AWS.AWSResult +import qualified Data.Text as T import qualified Data.ByteString.Lazy.Char8 as L import qualified Data.Map as M import Data.Char @@ -68,7 +69,7 @@ s3Setup u c = handlehost $ M.lookup "host" c remotename = fromJust (M.lookup "name" c) defbucket = remotename ++ "-" ++ fromUUID u defaults = M.fromList - [ ("datacenter", "US") + [ ("datacenter", T.unpack $ AWS.defaultRegion AWS.S3) , ("storageclass", "STANDARD") , ("host", defaultAmazonS3Host) , ("port", show defaultAmazonS3Port) |