summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 17:01:32 -0400
committerJoey Hess2014-06-05 17:01:32 -0400
commit4ac314fb4812ccdb62e930fe53e312ced6171e12 (patch)
tree110f785501a6bc7638edebfc12a7f6d3d7bea472 /config-joey.hs
parente1d7441e32818e06269353fa0044851ae09e1bdd (diff)
Apt.stdSourcesList no longer needs a suite to be specified.
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 3b4e57d6..2dcbf9b4 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -246,8 +246,7 @@ hosts = -- (o) `
standardSystem :: HostName -> DebianSuite -> Architecture -> Host
standardSystem hn suite arch = host hn
& os (System (Debian suite) arch)
- & Apt.stdSourcesList suite
- `onChange` Apt.upgrade
+ & Apt.stdSourcesList `onChange` Apt.upgrade
& Apt.cacheCleaned
& Apt.installed ["etckeeper"]
& Apt.installed ["ssh"]
@@ -270,8 +269,8 @@ standardSystem hn suite arch = host hn
-- This is my standard container setup, featuring automatic upgrades.
standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Host
standardContainer name suite arch = Docker.container name (dockerImage system)
- & os (System (Debian suite) arch)
- & Apt.stdSourcesList suite
+ & os system
+ & Apt.stdSourcesList `onChange` Apt.upgrade
& Apt.installed ["systemd"]
& Apt.unattendedUpgrades
& Apt.cacheCleaned