summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 15:17:57 -0400
committerJoey Hess2014-11-23 15:17:57 -0400
commit0ea0f7f4dee7f0e0835a82814fa89af6ce1756a1 (patch)
tree6eb9bbd4dfb6efc287a7174bdf9e0bbf0319221a /src/Propellor/CmdLine.hs
parent3c952a0de9d228eafe6e208007be7d2e018d68b8 (diff)
--spin can be passed multiple hosts, and it will provision each host in turn.
Note that if it fails to spin a host, it will stop. I think this is better than continuing to the next, because there might be a reason to spin hosts in some specific order (ie, update dns first and then use it).
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index f5cfc783..4a0ac613 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -39,8 +39,11 @@ usageError ps = do
processCmdLine :: IO CmdLine
processCmdLine = go =<< getArgs
where
- go ("--spin":h:[]) = Spin <$> hostname h <*> pure Nothing
- go ("--spin":h:"--via":r:[]) = Spin <$> hostname h <*> pure (Just r)
+ go ("--spin":ps) = case reverse ps of
+ (r:"--via":hs) -> Spin
+ <$> mapM hostname (reverse hs)
+ <*> pure (Just r)
+ _ -> Spin <$> mapM hostname ps <*> pure Nothing
go ("--add-key":k:[]) = return $ AddKey k
go ("--set":f:c:[]) = withprivfield f c Set
go ("--dump":f:c:[]) = withprivfield f c Dump
@@ -97,12 +100,14 @@ defaultMain hostlist = do
go _ (Update (Just h)) = forceConsole >> fetchFirst (update (Just h))
go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline
go True cmdline = updateFirst cmdline $ go False cmdline
- go False (Spin hn r) = withhost hn $ spin hn r
+ go False (Spin hs r) = do
+ commitSpin
+ forM_ hs $ \hn -> withhost hn $ spin hn r
go False cmdline@(SimpleRun hn) = buildFirst cmdline $
go False (Run hn)
go False (Run hn) = ifM ((==) 0 <$> getRealUserID)
( onlyprocess $ withhost hn mainProperties
- , go True (Spin hn Nothing)
+ , go True (Spin [hn] Nothing)
)
withhost :: HostName -> (Host -> IO ()) -> IO ()