cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-31 14:59:06 -04:00
parent e4c5884252
commit 35d79711fc
Failed to extract signature
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Propellor/CmdLine.hs
View File

@ -52,11 +52,12 @@ usage = do
defaultMain :: (HostName -> Maybe [Property]) -> IO () defaultMain :: (HostName -> Maybe [Property]) -> IO ()
defaultMain getprops = go =<< processCmdLine defaultMain getprops = go =<< processCmdLine
where where
go (Run host) = maybe (unknownhost host) ensureProperties (getprops host) go (Run host) = withprops host ensureProperties
go (Spin host) = spin host go (Spin host) = withprops host (const $ spin host)
go (Boot host) = maybe (unknownhost host) boot (getprops host) go (Boot host) = withprops host boot
go (Set host field) = setPrivData host field go (Set host field) = setPrivData host field
go (AddKey keyid) = addKey keyid go (AddKey keyid) = addKey keyid
withprops host a = maybe (unknownhost host) a (getprops host)
unknownhost :: HostName -> IO a unknownhost :: HostName -> IO a
unknownhost h = error $ unwords unknownhost h = error $ unwords
@ -74,11 +75,10 @@ spin host = do
status <- getstatus fromh `catchIO` error "protocol error" status <- getstatus fromh `catchIO` error "protocol error"
case status of case status of
NeedKeyRing -> do NeedKeyRing -> do
s <- w82s . BL.unpack . B64.encode d <- BL.readFile keyring
<$> BL.readFile keyring putStr $ "Sending " ++ keyring ++ " (" ++ show (BL.length d) ++ " bytes) to " ++ host ++ "..."
putStr $ "Sending " ++ keyring ++ " (" ++ show (BL.length s) ++ " bytes) to " ++ host ++ "..."
hFlush stdout hFlush stdout
hPutStrLn toh $ toMarked keyringMarker s hPutStrLn toh $ toMarked keyringMarker $ w82s $ BL.unpack $ B64.encode d
hFlush toh hFlush toh
putStrLn "done" putStrLn "done"
HaveKeyRing -> noop HaveKeyRing -> noop