summaryrefslogtreecommitdiff
path: root/src/Propellor/Types/Chroot.hs
diff options
context:
space:
mode:
authorJoey Hess2015-09-08 22:37:11 -0400
committerJoey Hess2015-09-08 22:37:11 -0400
commit386281202d5cb526d1b35022b3709b1f1064f68e (patch)
tree7dcea4e59765d4e1bb76ca23b864befc4546068a /src/Propellor/Types/Chroot.hs
parentb38cedc0a81085dd5e4267866d1f460054d9c50d (diff)
parentd7a9157e7e1e8f447864d9d0cdd20ed1839fc23c (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Types/Chroot.hs')
-rw-r--r--src/Propellor/Types/Chroot.hs20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/Propellor/Types/Chroot.hs b/src/Propellor/Types/Chroot.hs
index d37d34c7..d92c7070 100644
--- a/src/Propellor/Types/Chroot.hs
+++ b/src/Propellor/Types/Chroot.hs
@@ -1,23 +1,31 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+
module Propellor.Types.Chroot where
+import Propellor.Types
+import Propellor.Types.Empty
+import Propellor.Types.Info
+
import Data.Monoid
import qualified Data.Map as M
-import Propellor.Types.Empty
-data ChrootInfo host = ChrootInfo
- { _chroots :: M.Map FilePath host
+data ChrootInfo = ChrootInfo
+ { _chroots :: M.Map FilePath Host
, _chrootCfg :: ChrootCfg
}
- deriving (Show)
+ deriving (Show, Typeable)
+
+instance IsInfo ChrootInfo where
+ propigateInfo _ = False
-instance Monoid (ChrootInfo host) where
+instance Monoid ChrootInfo where
mempty = ChrootInfo mempty mempty
mappend old new = ChrootInfo
{ _chroots = M.union (_chroots old) (_chroots new)
, _chrootCfg = _chrootCfg old <> _chrootCfg new
}
-instance Empty (ChrootInfo host) where
+instance Empty ChrootInfo where
isEmpty i = and
[ isEmpty (_chroots i)
, isEmpty (_chrootCfg i)