diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-05 17:21:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-05 17:21:57 -0400 |
| commit | 4fdd1b9ea4082c4005ded2bf650f349090da6aea (patch) | |
| tree | fbb7c4dcae57d33af755c90890678390e41b450e /config-joey.hs | |
| parent | f8bad2726760268f1daae2a3329be5db310727b8 (diff) | |
| parent | c2dd54d167cafe471360fd1e470bd6e50e2ee36b (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 7 |
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 |