diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-23 15:43:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-23 15:43:06 -0400 |
| commit | 42ed4b5e68ec84106850c07904ee6124a7805742 (patch) | |
| tree | 9e49ef3e9a8d02d1951e07d1c31119e5eb7d5844 /config-joey.hs | |
| parent | 3f17dd7cbef4ec6bbccc368e07be964dc7f9570b (diff) | |
| parent | 3aee86abac10f1ad9d4b51c024f5f3c02cdbfc68 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/config-joey.hs b/config-joey.hs index fce4f7a1..1d39419a 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -85,10 +85,12 @@ darkstar = host "darkstar.kitenet.net" [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag , partition EXT4 `mountedAt` "/" + `mountOpt` errorReadonly , 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 +496,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" |