diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-11-01 11:51:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-01 11:51:08 -0400 |
| commit | 0afa0c0593b655af475ecc9db1e3add7d2c18299 (patch) | |
| tree | 0d69915201392ca2468acd1d089fd4350a9e17de /src/Propellor | |
| parent | 2891006d9f18b9f50b7d8dfc6d32e326499913f0 (diff) | |
Revert "propellor spin"
This reverts commit 2891006d9f18b9f50b7d8dfc6d32e326499913f0.
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Spin.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 0650e54d..478d1517 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -64,6 +64,7 @@ spin' mprivdata relay target hst = do getprivdata -- And now we can run it. + flushConcurrentOutput unlessM (boolSystem "ssh" (map Param $ cacheparams ++ ["-t", sshtarget, shellWrap runcmd])) $ error "remote propellor failed" where @@ -104,10 +105,8 @@ spin' mprivdata relay target hst = do d <- readPrivDataFile f nukeFile f return d - | otherwise -> do - d <- filterPrivData hst <$> decryptPrivData - flushConcurrentOutput - return d + | otherwise -> + filterPrivData hst <$> decryptPrivData Just pd -> pure pd -- Check if the Host contains an IP address that matches one of the IPs |
