diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-31 10:21:37 -0400 |
| commit | 43935ae7b06b44223cae4dc32613cd6751bc80f4 (patch) | |
| tree | 424120ce08af0bce3f1409a31861daf84b40951a /config-joey.hs | |
| parent | b1c4ddff04b5571e7ec60e7bfb014db76fd48eae (diff) | |
| parent | ca06c64bae82322348a07a97de924a1758a38b8f (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata/privdata.gpg
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs index fb90651e..74647df9 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -160,6 +160,9 @@ kite = standardSystemUnhardened "kite.kitenet.net" Unstable "amd64" -- Some users have zsh as their login shell. , "zsh" ] + + & Docker.configured + & Docker.garbageCollected `period` Daily diatom :: Host diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64" |
