From 463418726ad8d8b80b5f0aae302c18c1516774f8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Mar 2016 18:55:27 -0400 Subject: propellor spin --- config-joey.hs | 4 ++-- src/Propellor/CmdLine.hs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index 84db2155..12846d36 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -44,8 +44,8 @@ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.' Deployed -} -- `/-==__ _/__|/__=-| ( \_ hosts :: [Host] -- * \ | | '--------' hosts = -- (o) ` - [ darkstar - , gnu + [ darkstar + , gnu , clam , mayfly , oyster diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index f708c1d9..5dbc5836 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -113,8 +113,10 @@ defaultMain hostlist = withConcurrentOutput $ do go _ (DockerChain hn cid) = Docker.chain hostlist hn cid go _ (DockerInit hn) = Docker.init hn go _ (GitPush fin fout) = gitPushHelper fin fout - go cr (Relay h) = forceConsole >> updateFirst cr (Update (Just h)) (update (Just h)) - go _ (Update Nothing) = forceConsole >> fetchFirst (onlyprocess (update Nothing)) + go cr (Relay h) = forceConsole >> + updateFirst cr (Update (Just h)) (update (Just h)) + go _ (Update Nothing) = forceConsole >> + fetchFirst (onlyprocess (update Nothing)) go _ (Update (Just h)) = update (Just h) go _ Merge = mergeSpin go cr cmdline@(Spin hs mrelay) = buildFirst cr cmdline $ do -- cgit v1.2.3