diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-17 14:48:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-17 14:48:15 -0400 |
| commit | f6e352767eaf236acb929a9793dee28eb4897baa (patch) | |
| tree | 57189708f4142015de967938d4e098a2ea6e165e /src/Propellor/Spin.hs | |
| parent | fe052464493571ac26d825823c8c6e95ddb096e2 (diff) | |
| parent | 57f4eca88a1c3762b452171ee0a9d1a4f1367402 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Spin.hs')
| -rw-r--r-- | src/Propellor/Spin.hs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 401c9375..ecefbf6e 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -40,8 +40,8 @@ commitSpin = do void $ actionMessage "Push to central git repository" $ boolSystem "git" [Param "push"] -spin :: HostName -> Maybe HostName -> ControllerChain -> Host -> IO () -spin target relay cc hst = do +spin :: HostName -> Maybe HostName -> Host -> IO () +spin target relay hst = do cacheparams <- if viarelay then pure ["-A"] else toCommand <$> sshCachingParams hn @@ -89,9 +89,7 @@ spin target relay cc hst = do runcmd = "cd " ++ localdir ++ " && ./propellor " ++ cmd cmd = if viarelay then "--serialized " ++ shellEscape (show (Spin [target] (Just target))) - else if cc == mempty - then "--continue " ++ shellEscape (show (SimpleRun target)) - else "--continue " ++ shellEscape (show (ControlledRun target cc)) + else "--continue " ++ shellEscape (show (SimpleRun target)) -- Check if the Host contains an IP address that matches one of the IPs -- in the DNS for the HostName. If so, the HostName is used as-is, |