summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/config-joey.hs b/config-joey.hs
index fce4f7a1..8d6c9f33 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -88,7 +88,8 @@ darkstar = host "darkstar.kitenet.net"
, swapPartition (MegaBytes 256)
]
where
- c d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d
+ c d = Chroot.debootstrapped mempty d
+ & os (System (Debian Unstable) "amd64")
& Apt.installed ["linux-image-amd64"]
& User "root" `User.hasInsecurePassword` "root"
@@ -494,14 +495,13 @@ standardSystemUnhardened hn suite arch motd = host hn
-- This is my standard container setup, Featuring automatic upgrades.
standardContainer :: Systemd.MachineName -> DebianSuite -> Architecture -> Systemd.Container
-standardContainer name suite arch = Systemd.container name chroot
- & os system
- & Apt.stdSourcesList `onChange` Apt.upgrade
- & Apt.unattendedUpgrades
- & Apt.cacheCleaned
+standardContainer name suite arch =
+ Systemd.container name system (Chroot.debootstrapped mempty)
+ & Apt.stdSourcesList `onChange` Apt.upgrade
+ & Apt.unattendedUpgrades
+ & Apt.cacheCleaned
where
system = System (Debian suite) arch
- chroot = Chroot.debootstrapped system mempty
standardStableContainer :: Systemd.MachineName -> Systemd.Container
standardStableContainer name = standardContainer name (Stable "jessie") "amd64"