From 4e5048727e7316d4101be19d4f1e42d72d008adb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 Oct 2015 14:45:11 -0400 Subject: privdata propigation for Spin.controller Controlling host inherits the privdata for the host it spins, and sends it along to that host. --- src/Propellor/PrivData.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Propellor/PrivData.hs') diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index fd790878..070070f0 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -16,6 +16,7 @@ module Propellor.PrivData ( listPrivDataFields, makePrivDataDir, decryptPrivData, + readPrivData, PrivMap, PrivInfo, forceHostContext, @@ -248,7 +249,10 @@ modifyPrivData' f = do return r decryptPrivData :: IO PrivMap -decryptPrivData = fromMaybe M.empty . readish <$> gpgDecrypt privDataFile +decryptPrivData = readPrivData <$> gpgDecrypt privDataFile + +readPrivData :: String -> PrivMap +readPrivData = fromMaybe M.empty . readish makePrivDataDir :: IO () makePrivDataDir = createDirectoryIfMissing False privDataDir -- cgit v1.2.3