summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Gpg.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-14 16:14:05 -0400
committerJoey Hess2014-12-14 16:14:05 -0400
commit23399416f1ba89894f65f61b436c2b0f8378e6c5 (patch)
tree161b0d4bcf18cd7fb9bf58a7a7089b868dad2777 /src/Propellor/Property/Gpg.hs
parent71723ca09f369ccf96462cef1e0200e1615677d1 (diff)
broke up big function to describe PrivDataField
Diffstat (limited to 'src/Propellor/Property/Gpg.hs')
-rw-r--r--src/Propellor/Property/Gpg.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs
index 5819ea7b..4a3e1872 100644
--- a/src/Propellor/Property/Gpg.hs
+++ b/src/Propellor/Property/Gpg.hs
@@ -28,13 +28,14 @@ keyImported (GpgKeyId keyid) user = flagFile' prop genflag
genflag = do
d <- dotDir user
return $ d </> ".propellor-imported-keyid-" ++ keyid
- prop = withPrivData GpgKey (Context keyid) $ \getkey ->
+ prop = withPrivData src (Context keyid) $ \getkey ->
property desc $ getkey $ \key -> makeChange $
withHandle StdinHandle createProcessSuccess
(proc "su" ["-c", "gpg --import", user]) $ \h -> do
fileEncoding h
hPutStr h key
hClose h
+ src = PrivDataSource GpgKey "Either a gpg public key, exported with gpg --export -a, or a gpg private key, exported with gpg --export-secret-key -a"
dotDir :: UserName -> IO FilePath
dotDir user = do