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

propellor spin

This commit is contained in:
Joey Hess 2014-11-22 15:01:08 -04:00
parent fdde4d91c7
commit 0b9164e286
Failed to extract signature
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Propellor/Server.hs
View File

@ -74,7 +74,7 @@ updateServer target relay hst connect = connect go
sendRepoUrl toh sendRepoUrl toh
loop loop
(Just NeedPrivData) -> do (Just NeedPrivData) -> do
sendPrivData hn hst toh sendPrivData hn hst toh relay
loop loop
(Just NeedGitPush) -> do (Just NeedGitPush) -> do
sendGitUpdate hn fromh toh sendGitUpdate hn fromh toh
@ -96,12 +96,21 @@ updateServer target relay hst connect = connect go
sendRepoUrl :: Handle -> IO () sendRepoUrl :: Handle -> IO ()
sendRepoUrl toh = sendMarked toh repoUrlMarker =<< (fromMaybe "" <$> getRepoUrl) sendRepoUrl toh = sendMarked toh repoUrlMarker =<< (fromMaybe "" <$> getRepoUrl)
sendPrivData :: HostName -> Host -> Handle -> IO () sendPrivData :: HostName -> Host -> Handle -> Maybe HostName -> IO ()
sendPrivData hn hst toh = do sendPrivData hn hst toh target = do
privdata <- show . filterPrivData hst <$> decryptPrivData privdata <- getdata
void $ actionMessage ("Sending privdata (" ++ show (length privdata) ++ " bytes) to " ++ hn) $ do void $ actionMessage ("Sending privdata (" ++ show (length privdata) ++ " bytes) to " ++ hn) $ do
sendMarked toh privDataMarker privdata sendMarked toh privDataMarker privdata
return True return True
where
getdata
| isNothing target =
show . filterPrivData hst <$> decryptPrivData
| otherwise = do
let f = privDataRelay hn
d <- readFileStrictAnyEncoding f
nukeFile f
return d
sendGitUpdate :: HostName -> Handle -> Handle -> IO () sendGitUpdate :: HostName -> Handle -> Handle -> IO ()
sendGitUpdate hn fromh toh = sendGitUpdate hn fromh toh =