From 4ac314fb4812ccdb62e930fe53e312ced6171e12 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jun 2014 17:01:32 -0400 Subject: Apt.stdSourcesList no longer needs a suite to be specified. --- config-joey.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config-joey.hs') 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 -- cgit v1.3-2-g0d8e