cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "propellor spin" 

This reverts commit ac7b182b5a.
This commit is contained in:
Joey Hess 2014-10-23 11:39:29 -04:00
parent ac7b182b5a
commit 8d353813bf
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Propellor/Property.hs
View File

@ -135,7 +135,7 @@ host hn = Host hn [] mempty
-- --
-- Can add Properties and RevertableProperties -- Can add Properties and RevertableProperties
(&) :: IsProp p => Host -> p -> Host (&) :: IsProp p => Host -> p -> Host
(Host hn ps as) & p = Host hn (ps ++ [toProp p]) (as <> getInfo p) (Host hn ps is) & p = Host hn (ps ++ [toProp p]) (is <> getInfo p)
infixl 1 & infixl 1 &
@ -145,6 +145,14 @@ h ! p = h & revert p
infixl 1 ! infixl 1 !
-- | Like (&), but adds the property as the first property of the host.
-- Normally, property order should not matter, but this is useful
-- when it does.
(&^) :: IsProp p => Host -> p -> Host
(Host hn ps is) &^ p = Host hn ([toProp p] ++ ps) (getInfo p <> is)
infixl 1 &^
-- Changes the action that is performed to satisfy a property. -- Changes the action that is performed to satisfy a property.
adjustProperty :: Property -> (Propellor Result -> Propellor Result) -> Property adjustProperty :: Property -> (Propellor Result -> Propellor Result) -> Property
adjustProperty p f = p { propertySatisfy = f (propertySatisfy p) } adjustProperty p f = p { propertySatisfy = f (propertySatisfy p) }

2
src/Propellor/Property/Docker.hs
View File

@ -157,7 +157,7 @@ mkContainer cid@(ContainerId hn _cn) h = Container
h' = h h' = h
-- Restart by default so container comes up on -- Restart by default so container comes up on
-- boot or when docker is upgraded. -- boot or when docker is upgraded.
-- &^ restart RestartAlways &^ restart RestartAlways
-- Expose propellor directory inside the container. -- Expose propellor directory inside the container.
& volume (localdir++":"++localdir) & volume (localdir++":"++localdir)
-- Name the container in a predictable way so we -- Name the container in a predictable way so we