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

Merge branch 's3-classes'

Browse source
This commit is contained in:
Joey Hess 2015-09-22 11:05:53 -04:00
commit f33e760aab
5 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant/WebApp/Configurators/AWS.hs
View file

@ -41,11 +41,12 @@ glacierConfigurator a = do
where
needglaciercli = $(widgetFile "configurators/needglaciercli")
data StorageClass = StandardRedundancy | ReducedRedundancy
data StorageClass = StandardRedundancy | StandardInfrequentAccess | ReducedRedundancy
deriving (Eq, Enum, Bounded)
instance Show StorageClass where
show StandardRedundancy = "STANDARD"
show StandardInfrequentAccess = "STANDARD_IA"
show ReducedRedundancy = "REDUCED_REDUNDANCY"
data AWSInput = AWSInput
@ -75,6 +76,9 @@ s3InputAForm defcreds = AWSInput
storageclasses :: [(Text, StorageClass)]
storageclasses =
[ ("Standard redundancy", StandardRedundancy)
#if MIN_VERSION_aws(0,13,0)
, ("Infrequent access (cheaper for backups and archives)", StandardInfrequentAccess)
#endif
, ("Reduced redundancy (costs less)", ReducedRedundancy)
]