path: root/src/Propellor/PropAccum.hs
diff options
authorJoey Hess2015-09-30 15:33:14 -0400
committerJoey Hess2015-09-30 15:33:14 -0400
commit84561f6c429a59eaccfc6b957166baf66f7133a1 (patch)
treed5578fcf44df414c9e7c5c3435610fd4ceda0d77 /src/Propellor/PropAccum.hs
parent47ed1b33c3943852e01a4f376aa85187c07e52b7 (diff)
change HostContext for containers
Privdata that uses HostContext inside a container will now have the name of the container as its context, rather than the name of the host(s) where the container is used. This allows eg, having different passwords for a user in different containers. Note that previously, propellor would prompt using the container name as the context, but not actually use privdata using that context; so this is a bug fix. I don't entirely like the implementation; I had to put the code to change the context in PropAccum, and it's not generalized past PrivInfo.
Diffstat (limited to 'src/Propellor/PropAccum.hs')
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Propellor/PropAccum.hs b/src/Propellor/PropAccum.hs
index 4b2a5ddb..dec204a2 100644
--- a/src/Propellor/PropAccum.hs
+++ b/src/Propellor/PropAccum.hs
@@ -14,6 +14,7 @@ import Data.Monoid
import Propellor.Types
import Propellor.Property
import Propellor.Types.Info
+import Propellor.PrivData
-- | Starts accumulating the properties of a Host.
@@ -72,12 +73,16 @@ infixl 1 !
-- The Info of the propertyChildren is adjusted to only include
-- info that should be propigated out to the Property.
+-- Any PrivInfo that uses HostContext is adjusted to use the name
+-- of the container as its context.
:: (PropAccum container)
- => container
+ => String
+ -> container
-> Property HasInfo
-> Property HasInfo
-propigateContainer c prop = infoProperty
+propigateContainer containername c prop = infoProperty
(propertyDesc prop)
(propertySatisfy prop)
(propertyInfo prop)
@@ -85,6 +90,7 @@ propigateContainer c prop = infoProperty
hostprops = map go $ getProperties c
go p =
- let i = propigatableInfo (propertyInfo p)
+ let i = mapInfo (forceHostContext containername)
+ (propigatableInfo (propertyInfo p))
cs = map go (propertyChildren p)
in infoProperty (propertyDesc p) (propertySatisfy p) i cs