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 12:14:45 -04:00
parent 8e36dedf95
commit c5495fecc0
Failed to extract signature
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Propellor/CmdLine.hs
View File

@ -67,7 +67,11 @@ spin host = do
void $ boolSystem "git" [Param "push"] void $ boolSystem "git" [Param "push"]
privdata <- gpgDecrypt (privDataFile host) privdata <- gpgDecrypt (privDataFile host)
withBothHandles createProcessSuccess (proc "ssh" [user, bootstrapcmd url]) $ \(toh, fromh) -> do withBothHandles createProcessSuccess (proc "ssh" [user, bootstrapcmd url]) $ \(toh, fromh) -> do
hPutStrLn stderr "PRE-STATUS"
hFlush stderr
status <- readish . fromMarked statusMarker <$> hGetContents fromh status <- readish . fromMarked statusMarker <$> hGetContents fromh
hPutStrLn stderr "POST-STATUS"
hFlush stderr
case status of case status of
Nothing -> error "protocol error" Nothing -> error "protocol error"
Just NeedKeyRing -> do Just NeedKeyRing -> do
@ -121,8 +125,12 @@ boot :: [Property] -> IO ()
boot props = do boot props = do
havering <- doesFileExist keyring havering <- doesFileExist keyring
putStrLn $ toMarked statusMarker $ show $ if havering then HaveKeyRing else NeedKeyRing putStrLn $ toMarked statusMarker $ show $ if havering then HaveKeyRing else NeedKeyRing
hPutStrLn stderr "SENT STATUS"
hFlush stderr
hFlush stdout hFlush stdout
reply <- getContents reply <- getContents
hPutStrLn stderr $ "GOT " ++ reply
hFlush stderr
makePrivDataDir makePrivDataDir
writeFileProtected privDataLocal $ fromMarked privDataMarker reply writeFileProtected privDataLocal $ fromMarked privDataMarker reply
let keyringarmored = fromMarked keyringMarker reply let keyringarmored = fromMarked keyringMarker reply