summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Systemd.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-27 18:17:28 -0400
committerJoey Hess2016-03-27 18:17:28 -0400
commit7e76731a0098a6cd47979c86c8a484cc47e0b0d7 (patch)
tree57bc036a55d6792e5760c4e85fdfa600b46ace26 /src/Propellor/Property/Systemd.hs
parent553cd683761ca27dc220a5b2228bf3942c296897 (diff)
finished the conversion, including my config file!
It builds, but I have not yet tested if it works. Need to verify info propagation, etc.
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
-rw-r--r--src/Propellor/Property/Systemd.hs17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 94215593..e0b7d572 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -25,6 +25,7 @@ module Propellor.Property.Systemd (
MachineName,
Container,
container,
+ debContainer,
nspawned,
-- * Container configuration
containerCfg,
@@ -181,7 +182,7 @@ machined = withOS "machined installed" $ \w o ->
Apt.installed ["systemd-container"]
_ -> noChange
--- | Defines a container with a given machine name, and operating system,
+-- | Defines a container with a given machine name,
-- and how to create its chroot if not already present.
--
-- Properties can be added to configure the Container. At a minimum,
@@ -201,6 +202,20 @@ container name mkchroot =
where
chroot = mkchroot (containerDir name)
+-- | Defines a container with a given machine name, with the chroot
+-- created using debootstrap.
+--
+-- Properties can be added to configure the Container. At a minimum,
+-- add a property such as `osDebian` to specify the operating system
+-- to bootstrap.
+--
+-- > debContainer "webserver" $ props
+-- > & osDebian Unstable "amd64"
+-- > & Apt.installedRunning "apache2"
+-- > & ...
+debContainer :: MachineName -> Props metatypes -> Container
+debContainer name ps = container name $ \d -> Chroot.debootstrapped mempty d ps
+
-- | Runs a container using systemd-nspawn.
--
-- A systemd unit is set up for the container, so it will automatically