summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-11 02:03:51 -0400
committerJoey Hess2014-04-11 02:03:51 -0400
commitbe01532282bdca11e6fc97114206e44872d16eea (patch)
treef83455097fbf4e827bc65108dacdd603c7924947
parent16e91be138fa31d3896f156875ad4ce9f21c1478 (diff)
foo
-rw-r--r--Propellor/PrivData.hs3
-rw-r--r--Propellor/Property.hs1
2 files changed, 4 insertions, 0 deletions
diff --git a/Propellor/PrivData.hs b/Propellor/PrivData.hs
index 5adc9e94..c7af1aac 100644
--- a/Propellor/PrivData.hs
+++ b/Propellor/PrivData.hs
@@ -22,6 +22,9 @@ import Utility.Tmp
import Utility.SafeCommand
import Utility.Misc
+-- | When the specified PrivDataField is available on the host Propellor
+-- is provisioning, it provies the data to the action. Otherwise, it prints
+-- a message to help the user make the necessary private data available.
withPrivData :: PrivDataField -> (String -> Propellor Result) -> Propellor Result
withPrivData field a = maybe missing a =<< liftIO (getPrivData field)
where
diff --git a/Propellor/Property.hs b/Propellor/Property.hs
index 3a3c1cb1..83e19a73 100644
--- a/Propellor/Property.hs
+++ b/Propellor/Property.hs
@@ -105,6 +105,7 @@ host :: HostName -> Host
host hn = Host [] (\_ -> newAttr hn)
-- | Adds a property to a Host
+--
-- Can add Properties, RevertableProperties, and AttrProperties
(&) :: IsProp p => Host -> p -> Host
(Host ps as) & p = Host (ps ++ [toProp p]) (getAttr p . as)