summaryrefslogtreecommitdiff
path: root/src/Propellor/Types.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-19 01:28:38 -0400
committerJoey Hess2014-11-19 01:28:38 -0400
commit4dddbb725d9694b575bb665fa2369278b383f661 (patch)
treef7b4dd30691beb357f6fe52656e2684019883895 /src/Propellor/Types.hs
parent818fcdfb344f170f887e7480e04150e224b2f61e (diff)
prevent multiple concurrent provisioning inside docker container
Lock a lock file while provisioning inside, otherwise propellor could be running to init the container when the system has just booted, or the container was just started from being stopped, and at the same time, propellor run outside the container chains into it to provision. Previously, simplesh prevented this in a different way.
Diffstat (limited to 'src/Propellor/Types.hs')
-rw-r--r--src/Propellor/Types.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index 00da7495..75b3c2ab 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -145,8 +145,8 @@ data CmdLine
| ListFields
| AddKey String
| Continue CmdLine
- | Chain HostName
| Update HostName
- | Docker HostName
+ | DockerInit HostName
+ | DockerChain HostName String
| GitPush Fd Fd
deriving (Read, Show, Eq)