summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-20 14:45:11 -0400
committerJoey Hess2015-10-20 15:28:52 -0400
commit4e5048727e7316d4101be19d4f1e42d72d008adb (patch)
tree85b3282bf12d68e3af8e847cef535008bc575a05 /src/Propellor/CmdLine.hs
parent4c0b1f6e643882f43ac936b6bfdee78593ebc1d5 (diff)
privdata propigation for Spin.controller
Controlling host inherits the privdata for the host it spins, and sends it along to that host.
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index e0830693..a0be167e 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -117,9 +117,10 @@ defaultMain hostlist = do
go _ Merge = mergeSpin
go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline
go True cmdline = updateFirst cmdline $ go False cmdline
- go False (Spin hs r) = do
+ go False (Spin hs mrelay) = do
commitSpin
- forM_ hs $ \hn -> withhost hn $ spin hn r
+ forM_ hs $ \hn -> withhost hn $
+ spin (maybe RegularSpin RelaySpin mrelay) hn
go False cmdline@(SimpleRun hn) = buildFirst cmdline $
go False (Run hn)
go False (Run hn) = ifM ((==) 0 <$> getRealUserID)