summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-10-10 14:25:47 -0400
committerJoey Hess <joey@kitenet.net>2014-10-10 14:25:47 -0400
commitadbc70b768068657ed2c1942d8eb998f784c6f70 (patch)
tree9834475f5d2557d3687f4fd2d1ae381bfb2b12f3 /config-joey.hs
parent498769e232091d18f2b0dbd8f8392b3abbebf1e7 (diff)
parent4182cae2351e1251bdb22eeb63a4402bc51cc2de (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 2e0a757e..3bf01114 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -53,6 +53,7 @@ darkstar = host "darkstar.kitenet.net"
& Apt.buildDep ["git-annex"] `period` Daily
& Docker.configured
! Docker.docked hosts "android-git-annex"
+ ! Docker.docked hosts "webserver"
clam :: Host
clam = standardSystem "clam.kitenet.net" Unstable "amd64"
@@ -362,7 +363,6 @@ standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Host
standardContainer name suite arch = Docker.container name (dockerImage system)
& os system
& Apt.stdSourcesList `onChange` Apt.upgrade
- & Apt.installed ["systemd"]
& Apt.unattendedUpgrades
& Apt.cacheCleaned
& Docker.tweaked