diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-16 16:29:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-16 16:29:28 -0400 |
| commit | 5efd41327045f8da55c972b7391309c99dee5afc (patch) | |
| tree | 4fb7a681de188d6b598698ea505d63ae36958a3b | |
| parent | 669851454cd3032d2097842f7b6027b3464da032 (diff) | |
add encryption support to directory special remotes
| -rw-r--r-- | Remote/Directory.hs | 6 | ||||
| -rw-r--r-- | doc/special_remotes/directory.mdwn | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 2313f79a0..bb1ef60e4 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -26,6 +26,7 @@ import Config import Content import Utility import Remote.Special +import Remote.Encrypted remote :: RemoteType Annex remote = RemoteType { @@ -59,11 +60,12 @@ directorySetup u c = do Just d -> d e <- liftIO $ doesDirectoryExist dir when (not e) $ error $ "Directory does not exist: " ++ dir + c' <- encryptionSetup c -- The directory is stored in git config, not in this remote's -- persistant state, so it can vary between hosts. - gitConfigSpecialRemote u c "directory" dir - return $ M.delete "directory" c + gitConfigSpecialRemote u c' "directory" dir + return $ M.delete "directory" c' dirKey :: FilePath -> Key -> FilePath dirKey d k = d </> hashDirMixed k </> f </> f diff --git a/doc/special_remotes/directory.mdwn b/doc/special_remotes/directory.mdwn index daa0b7412..18d30e311 100644 --- a/doc/special_remotes/directory.mdwn +++ b/doc/special_remotes/directory.mdwn @@ -7,4 +7,4 @@ the drive's mountpoint as a directory remote. Setup example: - # git annex initremote usbdrive directory=/media/usbdrive/ + # git annex initremote usbdrive directory=/media/usbdrive/ encryption=none |