summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2019-04-08 13:32:32 -0400
committerJoey Hess2019-04-08 13:32:32 -0400
commitdd5cb6b03fe77ce7c4e46467048336c62d31b7a3 (patch)
tree642f6380634b37a5135881583dcaf14166e4991d /src/Propellor/Property
parent35435e16b63771c65f8223ff3fd2580cc8bad856 (diff)
change from inChroot to granular container capabilities info
* Removed inChroot, instead use hasContainerCapability FilesystemContained. (API change) * Hostname: Properties that used to not do anything in a systemd or docker container will now change the container's hostname, since it's namespaced. More container capabilities can easily be added later, to fine grain control what properties will run in different kinds of containers. This changed CmdLine's Read instance, which should be ok, because propellor inside the container is always updated at the same time as propellor outside, so when it chains into the chroot, it will know to expect the capability list. Docker was not setting InChroot before, but now sets both container capabilities, so chroot setting will also work in it. Note that, things that used to check inChroot before would not work in docker, but things that check FilesystemContained now will. It may be that some of those properties don't really work properly in docker. And, Grub.installed used to run grub-mkconfig in a docker container before, I doubt that made sense (was it even safe?); it doesn't do it now. This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Bootstrap.hs5
-rw-r--r--src/Propellor/Property/Chroot.hs43
-rw-r--r--src/Propellor/Property/Docker.hs3
-rw-r--r--src/Propellor/Property/Grub.hs7
-rw-r--r--src/Propellor/Property/Hostname.hs10
-rw-r--r--src/Propellor/Property/Localdir.hs4
-rw-r--r--src/Propellor/Property/Systemd.hs9
-rw-r--r--src/Propellor/Property/Uboot.hs4
8 files changed, 43 insertions, 42 deletions
diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs
index 6bbb4512..35df08e0 100644
--- a/src/Propellor/Property/Bootstrap.hs
+++ b/src/Propellor/Property/Bootstrap.hs
@@ -13,6 +13,7 @@ module Propellor.Property.Bootstrap (
import Propellor.Base
import Propellor.Bootstrap
import Propellor.Types.Info
+import Propellor.Types.Container
import Propellor.Property.Chroot
import Propellor.PrivData.Paths
@@ -58,7 +59,7 @@ data RepoSource
-- All build dependencies are installed, using distribution packages
-- or falling back to using cabal or stack.
bootstrappedFrom :: RepoSource -> Property Linux
-bootstrappedFrom reposource = check inChroot $
+bootstrappedFrom reposource = check (hasContainerCapability FilesystemContained) $
go `requires` clonedFrom reposource
where
go :: Property Linux
@@ -133,7 +134,7 @@ clonedFrom reposource = case reposource of
liftIO $ B.writeFile gitconfig cfg
return MadeChange
- needclone = (inChroot <&&> truelocaldirisempty)
+ needclone = (hasContainerCapability FilesystemContained <&&> truelocaldirisempty)
<||> (liftIO (not <$> doesDirectoryExist localdir))
truelocaldirisempty = exposeTrueLocaldir $ const $
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 5d29538c..48d96dcf 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -9,7 +9,6 @@ module Propellor.Property.Chroot (
ChrootBootstrapper(..),
Debootstrapped(..),
ChrootTarball(..),
- inChroot,
exposeTrueLocaldir,
-- * Internal use
provisioned',
@@ -23,6 +22,7 @@ import Propellor.Base
import Propellor.Container
import Propellor.Types.CmdLine
import Propellor.Types.Chroot
+import Propellor.Types.Container
import Propellor.Types.Info
import Propellor.Types.Core
import Propellor.Property.Chroot.Util
@@ -127,19 +127,20 @@ bootstrapped bootstrapper location ps = c
-- is first unmounted. Note that it does not ensure that any processes
-- that might be running inside the chroot are stopped.
provisioned :: Chroot -> RevertableProperty (HasInfo + Linux) Linux
-provisioned c = provisioned' c False
+provisioned c = provisioned' c False [FilesystemContained]
provisioned'
:: Chroot
-> Bool
+ -> [ContainerCapability]
-> RevertableProperty (HasInfo + Linux) Linux
-provisioned' c@(Chroot loc bootstrapper infopropigator _) systemdonly =
+provisioned' c@(Chroot loc bootstrapper infopropigator _) systemdonly caps =
(infopropigator c normalContainerInfo $ setup `describe` chrootDesc c "exists")
<!>
(teardown `describe` chrootDesc c "removed")
where
setup :: Property Linux
- setup = propellChroot c (inChrootProcess (not systemdonly) c) systemdonly
+ setup = propellChroot c (inChrootProcess (not systemdonly) c) systemdonly caps
`requires` built
built = case buildchroot bootstrapper (chrootSystem c) loc of
@@ -165,8 +166,8 @@ chrootInfo (Chroot loc _ _ h) = mempty `addInfo`
mempty { _chroots = M.singleton loc h }
-- | Propellor is run inside the chroot to provision it.
-propellChroot :: Chroot -> ([String] -> IO (CreateProcess, IO ())) -> Bool -> Property UnixLike
-propellChroot c@(Chroot loc _ _ _) mkproc systemdonly = property (chrootDesc c "provisioned") $ do
+propellChroot :: Chroot -> ([String] -> IO (CreateProcess, IO ())) -> Bool -> [ContainerCapability] -> Property UnixLike
+propellChroot c@(Chroot loc _ _ _) mkproc systemdonly caps = property (chrootDesc c "provisioned") $ do
let d = localdir </> shimdir c
let me = localdir </> "propellor"
shim <- liftIO $ Shim.setup me Nothing d
@@ -188,7 +189,7 @@ propellChroot c@(Chroot loc _ _ _) mkproc systemdonly = property (chrootDesc c "
chainprovision shim = do
parenthost <- asks hostName
- cmd <- liftIO $ toChain parenthost c systemdonly
+ cmd <- liftIO $ toChain parenthost c systemdonly caps
pe <- liftIO standardPathEnv
(p, cleanup) <- liftIO $ mkproc
[ shim
@@ -199,13 +200,13 @@ propellChroot c@(Chroot loc _ _ _) mkproc systemdonly = property (chrootDesc c "
liftIO cleanup
return r
-toChain :: HostName -> Chroot -> Bool -> IO CmdLine
-toChain parenthost (Chroot loc _ _ _) systemdonly = do
+toChain :: HostName -> Chroot -> Bool -> [ContainerCapability] -> IO CmdLine
+toChain parenthost (Chroot loc _ _ _) systemdonly caps = do
onconsole <- isConsole <$> getMessageHandle
- return $ ChrootChain parenthost loc systemdonly onconsole
+ return $ ChrootChain parenthost loc systemdonly onconsole caps
chain :: [Host] -> CmdLine -> IO ()
-chain hostlist (ChrootChain hn loc systemdonly onconsole) =
+chain hostlist (ChrootChain hn loc systemdonly onconsole caps) =
case findHostNoAlias hostlist hn of
Nothing -> errorMessage ("cannot find host " ++ hn)
Just parenthost -> case M.lookup loc (_chroots $ fromInfo $ hostInfo parenthost) of
@@ -216,11 +217,12 @@ chain hostlist (ChrootChain hn loc systemdonly onconsole) =
changeWorkingDirectory localdir
when onconsole forceConsole
onlyProcess (provisioningLock loc) $
- runChainPropellor (setInChroot h) $
+ runChainPropellor (setcaps h) $
ensureChildProperties $
if systemdonly
then [toChildProperty Systemd.installed]
else hostProperties h
+ setcaps h = h { hostInfo = hostInfo h `addInfo` caps }
chain _ _ = errorMessage "bad chain command"
inChrootProcess :: Bool -> Chroot -> [String] -> IO (CreateProcess, IO ())
@@ -252,21 +254,6 @@ mungeloc = replace "/" "_"
chrootDesc :: Chroot -> String -> String
chrootDesc (Chroot loc _ _ _) desc = "chroot " ++ loc ++ " " ++ desc
--- | Check if propellor is currently running within a chroot.
---
--- This allows properties to check and avoid performing actions that
--- should not be done in a chroot.
-inChroot :: Propellor Bool
-inChroot = extract . fromMaybe (InChroot False) . fromInfoVal <$> askInfo
- where
- extract (InChroot b) = b
-
-setInChroot :: Host -> Host
-setInChroot h = h { hostInfo = hostInfo h `addInfo` InfoVal (InChroot True) }
-
-newtype InChroot = InChroot Bool
- deriving (Typeable, Show)
-
-- | Runs an action with the true localdir exposed,
-- not the one bind-mounted into a chroot. The action is passed the
-- path containing the contents of the localdir outside the chroot.
@@ -276,7 +263,7 @@ newtype InChroot = InChroot Bool
-- we unmount the localdir to expose the true localdir. Finally, to cleanup,
-- the temp directory is bind mounted back to the localdir.
exposeTrueLocaldir :: (FilePath -> Propellor a) -> Propellor a
-exposeTrueLocaldir a = ifM inChroot
+exposeTrueLocaldir a = ifM (hasContainerCapability FilesystemContained)
( withTmpDirIn (takeDirectory localdir) "propellor.tmp" $ \tmpdir ->
bracket_
(movebindmount localdir tmpdir)
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 6aeec5fa..d06a2380 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -598,8 +598,9 @@ chain hostlist hn s = case toContainerId s of
go cid h = do
changeWorkingDirectory localdir
onlyProcess (provisioningLock cid) $
- runChainPropellor h $
+ runChainPropellor (setcaps h) $
ensureChildProperties $ hostProperties h
+ setcaps h = h { hostInfo = hostInfo h `addInfo` [HostnameContained, FilesystemContained] }
stopContainer :: ContainerId -> IO Bool
stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ]
diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs
index 852b8dcd..9b001476 100644
--- a/src/Propellor/Property/Grub.hs
+++ b/src/Propellor/Property/Grub.hs
@@ -18,9 +18,9 @@ import qualified Propellor.Property.File as File
import qualified Propellor.Property.ConfFile as ConfFile
import qualified Propellor.Property.Apt as Apt
import Propellor.Property.Mount
-import Propellor.Property.Chroot (inChroot)
import Propellor.Types.Info
import Propellor.Types.Bootloader
+import Propellor.Types.Container
import Utility.SafeCommand
import Data.List
@@ -34,10 +34,11 @@ type OSDevice = String
-- | Installs the grub package. This does not make grub be used as the
-- bootloader.
--
--- This includes running update-grub, unless it's run in a chroot.
+-- This includes running update-grub, unless it's run in a chroot
+-- or container.
installed :: GrubTarget -> Property (HasInfo + DebianLike)
installed grubtarget = installed' grubtarget
- `onChange` (check (not <$> inChroot) mkConfig)
+ `onChange` (check (not <$> hasContainerCapability FilesystemContained) mkConfig)
-- | Run update-grub, to generate the grub boot menu. It will be
-- automatically updated when kernel packages are installed.
diff --git a/src/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs
index 0ece92a8..8383fdaa 100644
--- a/src/Propellor/Property/Hostname.hs
+++ b/src/Propellor/Property/Hostname.hs
@@ -1,8 +1,10 @@
+{-# LANGUAGE LambdaCase #-}
+
module Propellor.Property.Hostname where
import Propellor.Base
import qualified Propellor.Property.File as File
-import Propellor.Property.Chroot (inChroot)
+import Propellor.Types.Container
import Utility.Split
import Data.List
@@ -41,7 +43,7 @@ setTo' extractdomain hn = combineProperties desc $ toProps
else Just ("127.0.1.1", [hn, basehost])
, Just ("127.0.0.1", ["localhost"])
]
- , check (not <$> inChroot) $
+ , check safetochange $
cmdProperty "hostname" [basehost]
`assume` NoChange
]
@@ -50,6 +52,10 @@ setTo' extractdomain hn = combineProperties desc $ toProps
basehost = takeWhile (/= '.') hn
domain = extractdomain hn
+ safetochange = askInfo >>= return . \case
+ [] -> True
+ caps -> HostnameContained `elem` caps
+
hostslines ipsnames =
File.fileProperty desc (addhostslines ipsnames) "/etc/hosts"
addhostslines :: [(String, [String])] -> [String] -> [String]
diff --git a/src/Propellor/Property/Localdir.hs b/src/Propellor/Property/Localdir.hs
index 018a054b..2323f569 100644
--- a/src/Propellor/Property/Localdir.hs
+++ b/src/Propellor/Property/Localdir.hs
@@ -7,7 +7,7 @@ module Propellor.Property.Localdir where
import Propellor.Base
import Propellor.Git.Config
import Propellor.Types.Info
-import Propellor.Property.Chroot (inChroot)
+import Propellor.Types.Container
import Propellor.Property.Mount (partialBindMountsOf, umountLazy)
-- | Sets the url to use as the origin of propellor's git repository.
@@ -46,7 +46,7 @@ removed = check (doesDirectoryExist localdir) $
return NoChange
where
atend _ = do
- ifM inChroot
+ ifM (hasContainerCapability FilesystemContained)
-- In a chroot, all we have to do is unmount localdir,
-- and then delete it
( liftIO $ umountLazy localdir
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 9e9a1de1..bfc0f9a5 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -278,16 +278,21 @@ nspawned c@(Container name (Chroot.Chroot loc builder _ _) h) =
-- Chroot provisioning is run in systemd-only mode,
-- which sets up the chroot and ensures systemd and dbus are
-- installed, but does not handle the other properties.
- chrootprovisioned = Chroot.provisioned' chroot True
+ chrootprovisioned = Chroot.provisioned' chroot True [FilesystemContained]
-- Use nsenter to enter container and and run propellor to
-- finish provisioning.
containerprovisioned :: RevertableProperty Linux Linux
containerprovisioned =
- tightenTargets (Chroot.propellChroot chroot (enterContainerProcess c) False)
+ tightenTargets (Chroot.propellChroot chroot (enterContainerProcess c) False containercaps)
<!>
doNothing
+ containercaps =
+ [ FilesystemContained
+ , HostnameContained
+ ]
+
chroot = Chroot.Chroot loc builder Chroot.propagateChrootInfo h
-- | Sets up the service files for the container, using the
diff --git a/src/Propellor/Property/Uboot.hs b/src/Propellor/Property/Uboot.hs
index 562d2441..098362e1 100644
--- a/src/Propellor/Property/Uboot.hs
+++ b/src/Propellor/Property/Uboot.hs
@@ -3,7 +3,7 @@ module Propellor.Property.Uboot where
import Propellor.Base
import Propellor.Types.Info
import Propellor.Types.Bootloader
-import Propellor.Property.Chroot
+import Propellor.Types.Container
import Propellor.Property.Mount
import qualified Propellor.Property.Apt as Apt
@@ -14,7 +14,7 @@ type BoardName = String
--
-- This includes writing it to the boot sector.
sunxi :: BoardName -> Property (HasInfo + DebianLike)
-sunxi boardname = setInfoProperty (check (not <$> inChroot) go) info
+sunxi boardname = setInfoProperty (check (not <$> hasContainerCapability FilesystemContained) go) info
`requires` Apt.installed ["u-boot", "u-boot-sunxi"]
where
go :: Property Linux