summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-21 20:53:38 -0400
committerJoey Hess2014-11-21 20:53:38 -0400
commit6cdd37d9ff3ff3e3b8439445c1363b9bdc77a5da (patch)
tree40ffdca8e7edf19ff41342015e595c765734fc60 /src/Propellor/Property/Systemd.hs
parent6c0746b6076bfeb33c2ab268b33aa93e1dab5742 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 554e6b20..a2130a21 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -10,6 +10,7 @@ module Propellor.Property.Systemd (
container,
nspawned,
containerCfg,
+ resolvConfed,
) where
import Propellor
@@ -30,6 +31,7 @@ type ServiceName = String
type MachineName = String
data Container = Container MachineName Chroot.Chroot Host
+ deriving (Show)
instance Hostlike Container where
(Container n c h) & p = Container n c (h & p)
@@ -166,7 +168,7 @@ nspawnService (Container name _ _) cfg = RevertableProperty setup teardown
disabled service `requires` stopped service
nspawnServiceParams :: ChrootCfg -> [String]
-nspawnServiceParams ChrootCfg = []
+nspawnServiceParams NoChrootCfg = []
nspawnServiceParams (SystemdNspawnCfg ps) =
M.keys $ M.filter id $ M.fromList ps
@@ -220,7 +222,7 @@ mungename = replace "/" "_"
containerCfg :: String -> RevertableProperty
containerCfg p = RevertableProperty (mk True) (mk False)
where
- mk b = pureInfoProperty ("container configured " ++ if b then "with " else "without " ++ p') $
+ mk b = pureInfoProperty ("container configuration " ++ (if b then "" else "without ") ++ p') $
mempty { _chrootinfo = mempty { _chrootCfg = SystemdNspawnCfg [(p', b)] } }
p' = case p of
('-':_) -> p