summaryrefslogtreecommitdiff
path: root/src/Propellor/PrivData.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-11 12:58:53 -0400
committerJoey Hess2014-11-11 12:58:53 -0400
commit84304821bebf9b794fae56f616b50ae1d06014d2 (patch)
treee43b936fc51e9c2bb75399cd23885dcb8b4b661c /src/Propellor/PrivData.hs
parentf559ccaf738535ad4b0ebb0b520542055d8ae305 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/PrivData.hs')
-rw-r--r--src/Propellor/PrivData.hs31
1 files changed, 2 insertions, 29 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index f55ab74c..a5150432 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -3,7 +3,6 @@
module Propellor.PrivData where
import Control.Applicative
-import System.FilePath
import System.IO
import System.Directory
import Data.Maybe
@@ -19,10 +18,11 @@ import Propellor.Types
import Propellor.Types.Info
import Propellor.Message
import Propellor.Info
+import Propellor.Gpg
+import Propellor.PrivData.Paths
import Utility.Monad
import Utility.PartialPrelude
import Utility.Exception
-import Utility.Process
import Utility.Tmp
import Utility.SafeCommand
import Utility.Misc
@@ -146,30 +146,3 @@ decryptPrivData = fromMaybe M.empty . readish <$> gpgDecrypt privDataFile
makePrivDataDir :: IO ()
makePrivDataDir = createDirectoryIfMissing False privDataDir
-
-privDataDir :: FilePath
-privDataDir = "privdata"
-
-privDataFile :: FilePath
-privDataFile = privDataDir </> "privdata.gpg"
-
-privDataLocal :: FilePath
-privDataLocal = privDataDir </> "local"
-
-gpgDecrypt :: FilePath -> IO String
-gpgDecrypt f = ifM (doesFileExist f)
- ( readProcess "gpg" ["--decrypt", f]
- , return ""
- )
-
-gpgEncrypt :: FilePath -> String -> IO ()
-gpgEncrypt f s = do
- encrypted <- writeReadProcessEnv "gpg"
- [ "--default-recipient-self"
- , "--armor"
- , "--encrypt"
- ]
- Nothing
- (Just $ flip hPutStr s)
- Nothing
- viaTmp writeFile f encrypted