summaryrefslogtreecommitdiff
path: root/Remote/S3real.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-16 13:25:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-16 13:25:27 -0400
commit7fdf20f577f63f8437c63d7d83e70d34de89269f (patch)
tree48ead5b187d7167d41c52cb83c917f9aaa85ed86 /Remote/S3real.hs
parent480d780297dac12576a90c25cca5cb989e1a1e4f (diff)
encryption key management working
Encrypted remotes don't yet encrypt data, but git annex initremote can be used to generate a cipher and add additional gpg keys that can use it.
Diffstat (limited to 'Remote/S3real.hs')
-rw-r--r--Remote/S3real.hs8
1 files changed, 3 insertions, 5 deletions
diff --git a/Remote/S3real.hs b/Remote/S3real.hs
index af4e48048..0f6327f57 100644
--- a/Remote/S3real.hs
+++ b/Remote/S3real.hs
@@ -28,6 +28,7 @@ import Messages
import Locations
import Config
import Remote.Special
+import Remote.Encrypted
remote :: RemoteType Annex
remote = RemoteType {
@@ -81,11 +82,8 @@ s3Connection c = do
s3Setup :: UUID -> RemoteConfig -> Annex RemoteConfig
s3Setup u c = do
-- verify configuration is sane
- case M.lookup "encryption" c of
- Nothing -> error "Specify encryption=key or encryption=none"
- Just "none" -> return ()
- Just _ -> error "encryption keys not yet supported"
- let fullconfig = M.union c defaults
+ c' <- encryptionSetup c
+ let fullconfig = M.union c' defaults
-- check bucket location to see if the bucket exists, and create it
let datacenter = fromJust $ M.lookup "datacenter" fullconfig