From e53faff843a34fd3a4655cb4ee6c570f2072d73e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jul 2014 03:42:35 -0400 Subject: propellor spin --- src/Propellor/PrivData.hs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/Propellor/PrivData.hs') diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index c6e41b45..f85ded15 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -109,20 +109,24 @@ editPrivData field context = do listPrivDataFields :: [Host] -> IO () listPrivDataFields hosts = do m <- decryptPrivData - putStrLn "\n" - let usedby = M.unionsWith (++) $ map mkhostmap hosts - let rows = map (mkrow usedby) (M.keys m) - let table = tableWithHeader header rows - putStr $ unlines $ formatTable table + showtable "Currently set data:" $ + map mkrow (M.keys m) + showtable "Data that would be used if set:" $ + map mkrow (M.keys $ M.difference wantedmap m) where header = ["Field", "Context", "Used by"] - mkrow usedby k@(field, (Context context)) = + mkrow k@(field, (Context context)) = [ shellEscape $ show field , shellEscape context , intercalate ", " $ sort $ fromMaybe [] $ M.lookup k usedby ] mkhostmap host = M.fromList $ map (\k -> (k, [hostName host])) $ S.toList $ _privDataFields $ hostInfo host + usedby = M.unionsWith (++) $ map mkhostmap hosts + wantedmap = M.fromList $ zip (M.keys usedby) (repeat "") + showtable desc rows = do + putStrLn $ "\n" ++ desc + putStr $ unlines $ formatTable $ tableWithHeader header rows setPrivDataTo :: PrivDataField -> Context -> PrivData -> IO () setPrivDataTo field context value = do -- cgit v1.2.3