diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 18:40:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 20:17:18 -0400 |
| commit | 0daf924b43d0750b285a5e857eb9946a9a71e6cc (patch) | |
| tree | a5ac2c8aa1464daa7c2649772242d466485935e2 /src/Propellor/PrivData.hs | |
| parent | ad4323859caea503114df40bde0f6b273441e6d2 (diff) | |
privdata/relocate
better than symlinks because this way no conflict can ever occur
and, commit from hook
Diffstat (limited to 'src/Propellor/PrivData.hs')
| -rw-r--r-- | src/Propellor/PrivData.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index ac7b00d3..bc09f0c6 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -251,12 +251,13 @@ modifyPrivData' f = do makePrivDataDir m <- decryptPrivData let (m', r) = f m - gpgEncrypt privDataFile (show m') - void $ boolSystem "git" [Param "add", File privDataFile] + privdata <- privDataFile + gpgEncrypt privdata (show m') + void $ boolSystem "git" [Param "add", File privdata] return r decryptPrivData :: IO PrivMap -decryptPrivData = readPrivData <$> gpgDecrypt privDataFile +decryptPrivData = readPrivData <$> (gpgDecrypt =<< privDataFile) readPrivData :: String -> PrivMap readPrivData = fromMaybe M.empty . readish |