diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
| commit | 8cc691dc868f1f43d985fea012dc84183b70341d (patch) | |
| tree | ab8485a66aa75c15e7dfdd2f00ab6011786e6b2d /src/Propellor/Property/Gpg.hs | |
| parent | db3f9050d6f4a098b82ae014a6a6e5e96a3067f6 (diff) | |
| parent | ddeee3ceb8ef5aa94ffc0696bff085eb031309d6 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Gpg.hs')
| -rw-r--r-- | src/Propellor/Property/Gpg.hs | 3 |
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 |